summaryrefslogtreecommitdiffstats
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-24 10:10:27 +0200
committerJunio C Hamano <junkio@cox.net>2006-06-24 10:10:27 +0200
commit86378b32895ee5d788491b8407608a54e5cf064c (patch)
tree673086ad557809bdc6b3811b0db89ebf56df3ba8 /git-merge.sh
parentMerge branch 'pb/error' (diff)
downloadgit-86378b32895ee5d788491b8407608a54e5cf064c.tar.xz
git-86378b32895ee5d788491b8407608a54e5cf064c.zip
git-pull: abort when fmt-merge-msg fails.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions