merge-recursive: leave unmerged entries in the index.
authorJunio C Hamano <junkio@cox.net>
Sun, 11 Dec 2005 06:05:01 +0000 (22:05 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 11 Dec 2005 09:47:15 +0000 (01:47 -0800)
commit28e77a8...647584bfbe112f19e12e9952ab0b2fab
tree28aa147...ac290ddb52840277fc4f42a597585125copy hash to clipboard (tree)
parent7564577...6c05a1153ddb94cbe68e75c391b52f20copy hash to clipboard (diff)
git-merge-recursive.py