Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Extract helper bits from c-merge-recursive work | Johannes Schindelin | 2006-07-26 |
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> |