summaryrefslogtreecommitdiff
path: root/xdelta3/xdelta3-merge.h
AgeCommit message (Expand)Author
2008-04-15Fixes for issue 70. The test inputs tickled a case where thejosh.macdonald
2008-04-09Add mechanism for processing merge arguments in order, memoryjosh.macdonald
2008-04-02Merge command passes its first smoke test, reproduces a delta byjosh.macdonald
2007-12-27Adding more support for "merge" command.josh.macdonald