Commit Graph

1 Commits (047f636d903c773e237f684826cc68c79a1a0075)

Author SHA1 Message Date
Johannes Schindelin 8fd2cb4069 Extract helper bits from c-merge-recursive work
This backports the pieces that are not uncooked from the merge-recursive
WIP we have seen earlier, to be used in git-mv rewritten in C.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-26 13:36:36 -07:00