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 /progress.c | |
| parent | 4496526f80b3e4952036550b279eff8d1babd60a (diff) | |
| download | git-ddfc44a898a58311392a5329687a1813d6b94779.tar.gz | |
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 'progress.c')
0 files changed, 0 insertions, 0 deletions