summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Lessley Dennington <lessleydennington@gmail.com>2021-12-06 15:55:59 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-12-06 09:55:06 -0800
commit338e2a9acc801ed4c5153b926579e7bea55a0be9 (patch)
tree47f6edc0fa226a8e81b2a2b0426f712dfb2745d2 /mergetools/tortoisemerge
parentrepo-settings: prepare_repo_settings only in git repos (diff)
downloadtgif-338e2a9acc801ed4c5153b926579e7bea55a0be9.tar.xz
diff: replace --staged with --cached in t1092 tests
Replace uses of the synonym --staged in t1092 tests with --cached (which is the real and preferred option). This will allow consistency in the new tests to be added with the upcoming change to enable the sparse index for diff. Signed-off-by: Lessley Dennington <lessleydennington@gmail.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions