On Wed, Aug 19, 2009 at 07:02:33PM +1000, Stephen Rothwell wrote: > Merging configfs/linux-next > CONFLICT (content): Merge conflict in fs/configfs/dir.c Silly question. The last time I had a conflict in next, you emailed me the details. How do I go about finding them on my own (without doing the complete merge you do)? Joel -- "Up and down that road in our worn out shoes, Talking bout good things and singing the blues." Joel Becker Principal Software Developer Oracle E-mail: joel.becker@xxxxxxxxxx Phone: (650) 506-8127 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
