aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-17 15:11:06 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-17 15:11:06 -0800
commit5bc5edbae1c5c3756a8927913d32d2b7519e30b0 (patch)
treecdf93e2aee7e575a71aaf493be3d170dd0c1e819 /git-mergetool--lib.sh
parentbcaf277b4ad5b7173a011d93a2ea1827f990f466 (diff)
parent87433261a46db1a9bd012acd7fba868f009ba38f (diff)
downloadgit-5bc5edbae1c5c3756a8927913d32d2b7519e30b0.tar.gz
git-5bc5edbae1c5c3756a8927913d32d2b7519e30b0.tar.xz
Merge branch 'jk/parseopt-usage-msg-opt' into maint
The function usage_msg_opt() has been updated to say "fatal:" before the custom message programs give, when they want to die with a message about wrong command line options followed by the standard usage string. * jk/parseopt-usage-msg-opt: parse-options: print "fatal:" before usage_msg_opt()
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions