summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Miklos Vajna <vmiklos@frugalware.org>2008-10-13 22:54:25 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-10-14 16:52:09 -0700
commit4e6d4bc0f0f1388dfcad2af4804b35289ed4ec92 (patch)
tree3bee459d407edb0e5ec41305d1f31670177fdade /merge-file.c
parentUpdate draft release notes to 1.6.0.3 (diff)
downloadtgif-4e6d4bc0f0f1388dfcad2af4804b35289ed4ec92.tar.xz
Add testcase to ensure merging an early part of a branch is done properly
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions