summaryrefslogtreecommitdiff
path: root/Documentation/git-help.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-07-22 14:42:38 -0700
committerJunio C Hamano <gitster@pobox.com>2011-07-22 14:42:38 -0700
commitf50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f (patch)
tree99cb0e9d99591f00b68eeb540d567aec88565475 /Documentation/git-help.txt
parentba9a247bf62a56c354bca640ba0ee131a3347864 (diff)
parent6b445773b78544032262b897c9aa3b5bd4405dd3 (diff)
downloadgit-f50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f.tar.gz
Merge branch 'jc/maint-mergetool-read-fix'
* jc/maint-mergetool-read-fix: mergetool: check return value from read
Diffstat (limited to 'Documentation/git-help.txt')
0 files changed, 0 insertions, 0 deletions