| commit | 389c3289cfa5bc0a232ad52df70fae1f6863d1a4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Jun 2016 21:27:37 +0000 (6 14:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Jun 2016 21:27:37 +0000 (6 14:27 -0700) | ||
| tree | 15092587a7ff56f43c48ea3718800087277afc6b | treesnapshot (tar.gz zip) |
| parent | 7dcbf891d975eba5b1e3095cb3b389834689ac09 | commitdiff |
| parent | 366f9cea18fbb7ebb0a75735da8c2a9d5a916809 | commitdiff |
Merge branch 'da/difftool' into maint
"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 |