diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-19 20:46:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-19 20:46:48 -0700 |
| commit | 5ec8217eb6c89974fda94808a310aa651577b25d (patch) | |
| tree | 81431dd1bc9acd3be5692363c225628e0993f659 /merge-recursive.c | |
| parent | 9b502a371e9bc340a537bb19d9a00750428e1651 (diff) | |
| parent | e622f41dcd97861796c7529712170f9eae07dc56 (diff) | |
| download | git-5ec8217eb6c89974fda94808a310aa651577b25d.tar.gz | |
Merge branch 'maint'
* maint:
git-mergetool: check return value from read
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions