diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-28 08:05:05 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-28 08:05:05 +0100 |
| commit | 6b94f1e404afc552e5139c4357331843f5be61ad (patch) | |
| tree | 78e89a35f8704f894b4c6c991a3228638bff4462 /sha1_name.c | |
| parent | Merge fixes up to GIT 1.1.5 (diff) | |
| download | git-6b94f1e404afc552e5139c4357331843f5be61ad.tar.xz git-6b94f1e404afc552e5139c4357331843f5be61ad.zip | |
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>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions