diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-06-06 14:27:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-06 14:27:37 -0700 |
| commit | 389c3289cfa5bc0a232ad52df70fae1f6863d1a4 (patch) | |
| tree | 15092587a7ff56f43c48ea3718800087277afc6b /dir-iterator.c | |
| parent | Merge branch 'tb/core-eol-fix' into maint (diff) | |
| parent | difftool: handle unmerged files in dir-diff mode (diff) | |
| download | tgif-389c3289cfa5bc0a232ad52df70fae1f6863d1a4.tar.xz | |
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
Diffstat (limited to 'dir-iterator.c')
0 files changed, 0 insertions, 0 deletions