summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
diff options
context:
space:
mode:
authorLibravatar Fredrik Kuivinen <freku045@student.liu.se>2005-09-13 23:41:39 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2005-09-13 15:45:26 -0700
commitdaae66994967ba503f5e868eddf6962a2c1d7871 (patch)
treed4fd861d3d0ee44817ad29c7d945124f4fb25042 /git-merge-recursive.py
parent[PATCH] Use a temporary index file when we merge the common ancestors. (diff)
downloadtgif-daae66994967ba503f5e868eddf6962a2c1d7871.tar.xz
[PATCH] Use the 'die' function where it is appropriate.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions