-
Committer:
James Westby
-
Date:
2007-06-21 22:42:20 UTC
-
Revision ID:
jw+debian@jameswestby.net-20070621224220-0usy9s1fxu85ajfk
Add the start of a testsuite for the merge upstream code.
* Move the code out to its own function to ease testing.
* Test merging in normal mode from a tarball, both when the merge
is clean and conflicts are generated.