diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-24 00:54:36 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-24 00:54:36 +0300 |
| commit | f895dd7422766f8ce95433619510e957e54f60cd (patch) | |
| tree | 7cc3a9bd2422588931d142ce1492351ca82ee216 /rerere.c | |
| parent | dca05bb5913026fb64f6392675e7ab3ff643dcec (diff) | |
| parent | 366f9cea18fbb7ebb0a75735da8c2a9d5a916809 (diff) | |
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 'rerere.c')
0 files changed, 0 insertions, 0 deletions