aboutsummaryrefslogtreecommitdiffstats
path: root/gitMergeCommon.py
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-09-12 23:29:54 +0200
committerJunio C Hamano <junkio@cox.net>2005-09-12 14:53:57 -0700
commitace36858d3adfde1e497404e831f1cac8034fd4a (patch)
tree9dd02597f01e25d1709c08cc73484abacb390fa2 /gitMergeCommon.py
parent[PATCH] Fix assertion failure when merging common ancestors. (diff)
downloadgit-ace36858d3adfde1e497404e831f1cac8034fd4a.tar.gz
git-ace36858d3adfde1e497404e831f1cac8034fd4a.zip
[PATCH] Exit with status code 2 if we get an exception.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitMergeCommon.py')
0 files changed, 0 insertions, 0 deletions