summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2021-01-23 14:00:43 +0100
committerJunio C Hamano <gitster@pobox.com>2021-01-23 13:25:12 -0800
commit796c248dc1eeaa99cf8074c30dec3ce7642f811e (patch)
tree382212a58728b821acf41fea383b23106ca9049e /builtin/diff.c
parentf918a89e50d4e31fe5b2db979122e76992951bc7 (diff)
git-svn tests: rewrite brittle tests to use "--[no-]merges".
Rewrite a brittle tests which used "rev-list" without "--[no-]merges" to figure out if a set of commits turned into merge commits or not. Signed-off-by: Jeff King <peff@peff.net> [ÆAB: wrote commit message] Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions