Phil Hord <phil.hord@xxxxxxxxx> writes: > On Tue, Mar 6, 2012 at 2:24 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > ... >> 'remaining':: >> >> Print paths with conflicts that are not resolved. >> >> Should be sufficient, I think. > > .... 'mergetool' uses this command to > avoid asking the user to resolve files which git rerere already > resolved for her. Ok, so "Print paths with conflicts that are not resolved." indeed is sufficient. -- 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