Author: rhuijben
Revision: 1426778
Modified property: svn:log
Modified: svn:log at Sat Dec 29 16:30:10 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sat Dec 29 16:30:10 2012
@@ -19,3 +19,5 @@ his working copy, instead of by expectin
4: Expect delete of deleted node to fail.
(in deleted ancestor): Expect invalid revnum.
Don't try to delete A/D/H a third time.
+
+ (test_funcs): Expect merging_commit to pass.