summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2020-11-11 12:28:17 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-11 09:07:52 -0800
commit6f1a5caa0b69278bc7eb79d3474a1e881bd0c663 (patch)
treed26f87bff71fe67f801b6a58c5d192d9e83dc631 /git-merge-resolve.sh
parentadd -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers (diff)
downloadtgif-6f1a5caa0b69278bc7eb79d3474a1e881bd0c663.tar.xz
add -i: use `reset_color` consistently
We already maintain a list of colors in the `add_i_state`, therefore we should use them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions