merge-recursive: Replace 'except:'
authorFredrik Kuivinen <freku045@student.liu.se>
Sun, 20 Nov 2005 12:14:37 +0000 (13:14 +0100)
committerJunio C Hamano <junkio@cox.net>
Sun, 20 Nov 2005 18:47:16 +0000 (10:47 -0800)
commita6322d0...9b1d2e2cb72da1271171b35a173f3d22
tree0c703eb...880645a218de511c43640ea1fcd732becopy hash to clipboard (tree)
parent9ae2172...ed289f2706a0e88288909fa47eddd7e7copy hash to clipboard (diff)
git-merge-recursive.py