summaryrefslogtreecommitdiff
path: root/t/t7611-merge-abort.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-12-11 11:14:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-12-11 11:14:18 -0800
commitabca668a93f0039c8c3fe81a6625fcdf81c35bdf (patch)
tree4c76311689c4e2f16694cf4cf2f7ee29cd4b54a8 /t/t7611-merge-abort.sh
parentMerge branch 'cb/t3404-shellquote' into maint (diff)
parentMake error message after failing commit_lock_file() less confusing (diff)
downloadtgif-abca668a93f0039c8c3fe81a6625fcdf81c35bdf.tar.xz
Merge branch 'sg/lock-file-commit-error' into maint
Cosmetic improvement to lock-file error messages. * sg/lock-file-commit-error: Make error message after failing commit_lock_file() less confusing
Diffstat (limited to 't/t7611-merge-abort.sh')
0 files changed, 0 insertions, 0 deletions