diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-12-01 00:05:07 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-12-01 14:45:59 -0800 |
| commit | ddfc44a898a58311392a5329687a1813d6b94779 (patch) | |
| tree | b264cec304adc063f1f186bd799bebacc03edf53 /t/helper/test-online-cpus.c | |
| parent | xdiff: implement a zealous diff3, or "zdiff3" (diff) | |
| download | tgif-ddfc44a898a58311392a5329687a1813d6b94779.tar.xz | |
update documentation for new zdiff3 conflictStyle
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/helper/test-online-cpus.c')
0 files changed, 0 insertions, 0 deletions