diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-23 14:54:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-23 14:54:36 -0700 |
| commit | f895dd7422766f8ce95433619510e957e54f60cd (patch) | |
| tree | 7cc3a9bd2422588931d142ce1492351ca82ee216 /t/t5100/patch0015--no-inbody-headers | |
| parent | Merge branch 'jk/test-z-n-unquoted' (diff) | |
| parent | difftool: handle unmerged files in dir-diff mode (diff) | |
| download | tgif-f895dd7422766f8ce95433619510e957e54f60cd.tar.xz | |
Merge branch 'da/difftool'
"git difftool" learned to handle unmerged paths correctly in
dir-diff mode.
* da/difftool:
difftool: handle unmerged files in dir-diff mode
difftool: initialize variables for readability
Diffstat (limited to 't/t5100/patch0015--no-inbody-headers')
0 files changed, 0 insertions, 0 deletions