summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-24 08:10:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-24 08:10:27 (GMT)
commit86378b32895ee5d788491b8407608a54e5cf064c (patch)
tree673086ad557809bdc6b3811b0db89ebf56df3ba8 /Documentation/merge-options.txt
parentbc1f262d67cbe1c736c5dca911f6f085f47ac9bb (diff)
downloadgit-86378b32895ee5d788491b8407608a54e5cf064c.zip
git-86378b32895ee5d788491b8407608a54e5cf064c.tar.gz
git-86378b32895ee5d788491b8407608a54e5cf064c.tar.bz2
git-pull: abort when fmt-merge-msg fails.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions