summaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2008-10-26 00:49:35 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-10-26 14:09:48 -0700
commit4f672ad6c77bfe73cc5dd4b240fd42303d101d2a (patch)
treee3d9e6567ef56d9d6db05bb3dadf05a62b67c4fe /t/t6026-merge-attr.sh
parentonly textconv regular files (diff)
downloadtgif-4f672ad6c77bfe73cc5dd4b240fd42303d101d2a.tar.xz
wt-status: load diff ui config
When "git status -v" shows a diff, we did not respect the user's usual diff preferences at all. Loading just git_diff_basic_config would give us things like rename limits and diff drivers. But it makes even more sense to load git_diff_ui_config, which gives us colorization if the user has requested it. Note that we need to take special care to cancel colorization when writing to the commit template file, as described in the code comments. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6026-merge-attr.sh')
0 files changed, 0 insertions, 0 deletions