diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-09 10:41:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-09 10:41:37 -0800 |
| commit | 5b1c54ac99e6847eaff409cd6fb328fd0f8d9076 (patch) | |
| tree | f8016300d5cd7bbf3cdc062ccaca86238879da6d /t/t4002-diff-basic.sh | |
| parent | b6825b5c8e8b58943511f2576475accf1593486e (diff) | |
| parent | f309e8e768ec5de97e8ab3dcd223f32865176290 (diff) | |
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index
* ew/empty-merge-with-dirty-index-maint:
merge-recursive: do not look at the index during recursive merge
Diffstat (limited to 't/t4002-diff-basic.sh')
0 files changed, 0 insertions, 0 deletions