merge-recursive: cleanup setIndexStages
authorJunio C Hamano <junkio@cox.net>
Sun, 11 Dec 2005 09:55:52 +0000 (01:55 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 11 Dec 2005 09:55:52 +0000 (01:55 -0800)
commit157dc07...68faf6537af1d2ce676a4f2dda2f71a6
tree8b0ce22...a65a5a592b099f7c096e80ba8df77981copy hash to clipboard (tree)
parent28e77a8...647584bfbe112f19e12e9952ab0b2fabcopy hash to clipboard (diff)
git-merge-recursive.py