summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-26 16:09:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-26 16:09:15 -0700
commitb3e588a48af0ce15832c240887b9a3f9361d22bb (patch)
tree62a76375549a77aa430867df46853f2f18a82270 /t/t7605-merge-resolve.sh
parentMerge branch 'mm/config-color-ui-default-to-auto' (diff)
parentpretty: let %C(auto) reset all attributes (diff)
downloadtgif-b3e588a48af0ce15832c240887b9a3f9361d22bb.tar.xz
Merge branch 'rs/c-auto-resets-attributes'
The pretty-format specifier "%C(auto)" used by the "log" family of commands to enable coloring of the output is taught to also issue a color-reset sequence to the output. * rs/c-auto-resets-attributes: pretty: let %C(auto) reset all attributes
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions