| commit | b3038a5adb00a42afed69da31b6a8d85d5e3fad1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Sep 2011 04:53:39 +0000 (11 21:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Sep 2011 04:53:39 +0000 (11 21:53 -0700) | ||
| tree | a730e36b3a5dfb0439fb53369e3aac22f1d18579 | treesnapshot (tar.gz zip) |
| parent | eff7c32cfd12867000d6449d335fad0e7c9751f1 | commitdiff |
| parent | 6b445773b78544032262b897c9aa3b5bd4405dd3 | commitdiff |
Merge branch 'jc/maint-mergetool-read-fix' into maint
* jc/maint-mergetool-read-fix:
mergetool: check return value from read
* jc/maint-mergetool-read-fix:
mergetool: check return value from read