merge: seed the commit message with list of conflicted files.
authorJunio C Hamano <junkio@cox.net>
Sat, 28 Jan 2006 07:05:05 +0000 (23:05 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 28 Jan 2006 07:05:05 +0000 (23:05 -0800)
commit6b94f1e...04afc552e5139c4357331843f5be61ad
tree78e89a3...f8704f894b4c6c991a3228638bff4462copy hash to clipboard (tree)
parent767e130...15015f897fb87b939843b4882212574bcopy hash to clipboard (diff)
git-merge.sh