summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2010-08-18 14:36:44 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-18 13:20:56 -0700
commit997b688769f8d3ea539990ab53d6a44a46a2b2b4 (patch)
tree033f782e73e704995b261ef99377f78c355c1c6e /merge-file.c
parentcherry-pick/revert: Use advise() for hints (diff)
downloadtgif-997b688769f8d3ea539990ab53d6a44a46a2b2b4.tar.xz
tests: fix syntax error in "Use advise() for hints" test
Change the test introduced in the "Use advise() for hints" patch by Jonathan Nieder not to use '' for quotes inside '' delimited code. It ended up introducing a file called <paths> to the main git repository. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions