summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-config-explicit-merge
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2011-02-28 18:08:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-02 11:52:59 -0800
commiteeba0d1760d6922e7d6ee838b8684e87a6c0c273 (patch)
treed545e76e239b17726b56a10dbc0a7bc52a3880f4 /t/t5515/fetch.br-config-explicit-merge
parentt6022: New test checking for unnecessary updates of renamed+modified files (diff)
downloadtgif-eeba0d1760d6922e7d6ee838b8684e87a6c0c273.tar.xz
t6022: New test checking for unnecessary updates of files in D/F conflicts
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/fetch.br-config-explicit-merge')
0 files changed, 0 insertions, 0 deletions