summaryrefslogtreecommitdiff
path: root/xdelta3/xdelta3-merge.h
AgeCommit message (Expand)Author
2008-07-07Make these files compile with C++.josh.macdonald
2008-04-22First successful merge command. :)josh.macdonald
2008-04-20No, doesn't work but this is a little closer. The bug-fix for thejosh.macdonald
2008-04-20It's plausible that this merge code actually works; untested.josh.macdonald
2008-04-19Cleanup of previous. New xd3_merge_input_output used in bothjosh.macdonald
2008-04-19Straighten up the logic for calling xd3_merge_inputs in both josh.macdonald
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