Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > I often end up with conflicts, and I just want to edit the conflicting > files, one after another. To make this easier, I wrote a script (yes, no > builtin) to start the editor with the files having conflicts. > > -- snipsnap -- > #!/bin/sh > # > # Copyright (c) 2006, Shawn O. Pearce Sweet! My evil plan is working... you do all of the work and I get all of the credit! Last year to boot! ;-) Yes, I did see the other message about how you copied the preamble from git-gc.sh... ;-) -- Shawn. - 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