Hi, On Mon, May 18, 2009 at 6:45 PM, Nanako Shiraishi <nanako3@xxxxxxxxxxx> wrote: > I think -Xours enhancement that was developed long time ago I think this is now called -s ours/--strategy=ours: http://www.kernel.org/pub/software/scm/git/docs/git-merge.html -- Cheers, Ray Chuan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html