summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-12-09 05:08:35 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-12-09 13:33:13 -0800
commit324b170b88475811cb0506a30b4710ffc89ae936 (patch)
tree12a7d4bd862143a92a1d81c0e533c6c314005e77 /Documentation/git-mergetool.txt
parentdir: new flag to remove_dir_recurse() to spare the original_cwd (diff)
downloadtgif-324b170b88475811cb0506a30b4710ffc89ae936.tar.xz
t2501: simplify the tests since we can now assume desired behavior
We no longer are dealing with a mixture of previous and desired behavior, so simplify the tests a bit. Acked-by: Derrick Stolee <stolee@gmail.com> Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions