"Martin Langhoff" <martin.langhoff@xxxxxxxxx> writes: > I'm somewhat confused by the fact that there are two emacs modes, both > by Alexandre. Which one should I use? Also -- the killer app for > emacs+git would be to leverage the great patch-editing mode in emacs. They are different styles. I've been in VC camp but my understanding is pcl-cvs style integration is closer to whole-tree than VC which is more per-file. I still haven't adjusted to pcl-cvs style yet.. > (of course, if xxdiff and others can help, that'd be cool too, but > currently they seem strangely unable to deal with files with diff3 > conflict markers.) I had pleasant experiences with "xxdiff -U". - : 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