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 /ll-merge.c | |
| parent | Merge branch 'ph/format-patch-no-color' (diff) | |
| parent | git-mergetool: check return value from read (diff) | |
| download | tgif-5ec8217eb6c89974fda94808a310aa651577b25d.tar.xz | |
Merge branch 'maint'
* maint:
git-mergetool: check return value from read
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions