tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Thu, 22 Mar 2007 23:52:50 -0500
changeset 4266 fe7f38dda34b
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
tags: fix abababa case, with test case

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)