Theodore Tso wrote: > After looking at ediff, it is definitely the more polished and > featureful compared to emerge --- except in one critical area, which > is calling as a mergeing tool from a shell script or command line. [...] > emacs --eval "(ediff-merge-files-with-ancestor \"$LOCAL\" \"$REMOTE\" \"$BASE\" nil \"$path\")" > > Unfortunately, it's not enough. Ediff doesn't have an "abort" command > which returns a non-zero exit status, and when you use the "quit" > command, it asks you a series of obnoxious questions: > > Quit this Ediff session? (y or n) > File /usr/projects/git/test/testfile.c exists, overwrite? (y or n) > Merge buffer saved in /usr/projects/git/test/testfile.c > <delay for 3 annoying seconds> > Merge buffer saved. Now kill the buffer? (y or n) Yeah, I normally just save the merged buffer and quit. This skips all that. But I will add your little snippet to my .emacs :) Sam. - 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
