On Sat, Jan 17, 2009 at 05:35:22PM -0800, Junio C Hamano wrote: > Markus Heidelberg <markus.heidelberg@xxxxxx> writes: > > > When resolving conflicts, you only need to edit the $MERGED file. Put > > the cursor automatically into its window for vimdiff and gvimdiff to > > avoid doing <C-w>l every time. > > I think this is sensible. > > I do not use vim, and I do not know if the patch does what it claims to > do, though. It does. Tested-by: SZEDER Gábor <szeder@xxxxxxxxxx> -- 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