diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:47 -0800 |
| commit | 4ce498baa3976cf96d3feb4215a486dd47ec2e7b (patch) | |
| tree | 6461c3669e41cebaf33f124d5964c06072803187 /t/helper/test-simple-ipc.c | |
| parent | Merge branch 'ds/trace2-regions-in-tests' (diff) | |
| parent | update documentation for new zdiff3 conflictStyle (diff) | |
| download | tgif-4ce498baa3976cf96d3feb4215a486dd47ec2e7b.tar.xz | |
Merge branch 'en/zdiff3'
"Zealous diff3" style of merge conflict presentation has been added.
* en/zdiff3:
update documentation for new zdiff3 conflictStyle
xdiff: implement a zealous diff3, or "zdiff3"
Diffstat (limited to 't/helper/test-simple-ipc.c')
0 files changed, 0 insertions, 0 deletions