summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Tim Henigan <tim.henigan@gmail.com>2012-03-22 15:52:18 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-23 11:46:26 -0700
commit283607694c1248a8e1ff4cda48aa5d1eb1287733 (patch)
tree750855c35b84cbc13288c03fa43ff9ec7abd14cf /Documentation/git-merge.txt
parentdifftool: add '--no-gui' option (diff)
downloadtgif-283607694c1248a8e1ff4cda48aa5d1eb1287733.tar.xz
difftool: exit(0) when usage is printed
Prior to this commit, the script exited with an error whenever the usage string was printed, regardless of the reason it was done. In cases where usage was printed due to a user request (e.g. '-h' option), the script should exit without error (exit 0). This commit adds an argument to the usage function that allows the exit code to be specified when the function is called. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions