summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2011-08-29 10:32:23 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-29 09:49:42 -0700
commit9aa7c16f5ec96de9b5fe7b272832fbb061d1fee2 (patch)
tree5744e4475929485b97b84d6974d31cdd6f32e74a /merge-recursive.c
parentgit-p4: Add simple test case for branch import (diff)
downloadtgif-9aa7c16f5ec96de9b5fe7b272832fbb061d1fee2.tar.xz
git-p4: simple branch tests edits
More review comments. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions