| commit | f895dd7422766f8ce95433619510e957e54f60cd | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 May 2016 21:54:36 +0000 (23 14:54 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 May 2016 21:54:36 +0000 (23 14:54 -0700) | ||
| tree | 7cc3a9bd2422588931d142ce1492351ca82ee216 | treesnapshot (tar.gz zip) |
| parent | dca05bb5913026fb64f6392675e7ab3ff643dcec | commitdiff |
| parent | 366f9cea18fbb7ebb0a75735da8c2a9d5a916809 | commitdiff |
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
"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
| t/t7800-difftool.sh | diff1 | diff2 | blobhistory |