diff options
| author | Andreas Heiduk <asheiduk@gmail.com> | 2017-07-25 22:53:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-25 14:30:49 -0700 |
| commit | c0bb6d9cef66d132ba33ff4a62eda3a7038b75d0 (patch) | |
| tree | 63e31ae28bb1f8d946896f05501ac4be1fbf38dc /git-merge-resolve.sh | |
| parent | 95d67879735cfecfdd85f89e59d993c5b4de8835 (diff) | |
| download | git-c0bb6d9cef66d132ba33ff4a62eda3a7038b75d0.tar.gz git-c0bb6d9cef66d132ba33ff4a62eda3a7038b75d0.tar.xz | |
doc: add missing values "none" and "default" for diff.wsErrorHighlight
The values have eluded documentation so far. While at it streamline
the wording by grouping relevant parts together.
Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions