Junio C Hamano 6b94f1e404 merge: seed the commit message with list of conflicted files. ...

The files with conflicts need to be hand resolved, and it is a
good discipline for the committer to explain which branch was
taken and why.  Pre-fill the merge message template with the
list of conflicted paths to encourage it.

This is from Linus.

Signed-off-by: Junio C Hamano <junkio@cox.net>

2006-01-27 23:05:05 -08:00

6.6 KiB

Executable File

Raw Blame History

View Raw