| commit | 5ec8217eb6c89974fda94808a310aa651577b25d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Sep 2011 03:46:48 +0000 (19 20:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Sep 2011 03:46:48 +0000 (19 20:46 -0700) | ||
| tree | 81431dd1bc9acd3be5692363c225628e0993f659 | treesnapshot (tar.gz zip) |
| parent | 9b502a371e9bc340a537bb19d9a00750428e1651 | commitdiff |
| parent | e622f41dcd97861796c7529712170f9eae07dc56 | commitdiff |
Merge branch 'maint'
* maint:
git-mergetool: check return value from read
* maint:
git-mergetool: check return value from read
| git-mergetool--lib.sh | diff1 | diff2 | blobhistory |