Code

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)
commit157dc07368faf6537af1d2ce676a4f2dda2f71a6
tree8b0ce228a65a5a592b099f7c096e80ba8df77981
parent28e77a81647584bfbe112f19e12e9952ab0b2fab
merge-recursive: cleanup setIndexStages

Fredrik points out there is a useful wrapper runProgram() used
everywhere that we can use to feed input into subprocess.  Use
it to catch errors from the subprocess; it is a good cleanup as
well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-recursive.py