On Sun, Feb 27, 2011 at 11:57, Sebastian Schuberth <sschuberth@xxxxxxxxx> wrote: >> with your suggestion. We should probably make use of the -title options >> to remove ambiguity. > > Good idea, I'll look into this. Given that the -title options actually replace the display of the file name (instead of displaying the title in addition), I'd prefer not to make use of these options. In fact, the file names Git uses for merging already contain "BASE", "LOCAL", "REMOTE", so there should be no real need for additional titles, IMHO. I'll push out the updated series now. -- Sebastian Schuberth -- 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