summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2010-08-15 10:16:25 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-15 19:20:11 -0700
commit65113121a50cd765033d51204213c817832c59cf (patch)
treebd46d2ff0a5911d02b1cc8b1f0117dc437ff89d7 /builtin/merge-index.c
parentdiff --follow: do call diffcore_std() as necessary (diff)
downloadtgif-65113121a50cd765033d51204213c817832c59cf.tar.xz
log: test for regression introduced in v1.7.2-rc0~103^2~2
Add a regression test for the git log -M --follow $diff_option bug introduced in v1.7.2-rc0~103^2~2, $diff_option being diff related options like -p, --stat, --name-only etc. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions