summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-22 22:24:10 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-22 22:24:10 -0800
commit3d0e75f2f7a9ae9329154dc85bf5af5c5482f3ea (patch)
tree9adbcea8c1aa6dc40ffb9861489642bf9aee574b /mergetools/p4merge
parentGit 1.7.12.4 (diff)
downloadtgif-3d0e75f2f7a9ae9329154dc85bf5af5c5482f3ea.tar.xz
diff-options: unconfuse description of --color
It said "by default it is off" while it also said "the default is always", which confused everybody who read it only once. It wanted to say (1) if you do not say --color, it is not enabled, and (2) if you say --color but do not say when to enable it, it will always be enabled". Rephrase to clarify by using "default" only once. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions