summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2010-07-02 14:59:48 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-05 11:23:45 -0700
commitb5500d16cd1021bc1430ad019512c636dd3311d6 (patch)
tree9223d5daa6df5fafc9d1b016174cb0ec9af12b1d /builtin/merge-file.c
parentt/README: Document test_expect_code (diff)
downloadtgif-b5500d16cd1021bc1430ad019512c636dd3311d6.tar.xz
t/README: Add a section about skipping tests
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions