comparison tests/test-bad-pull.out @ 4819:9797124581c9

merge: fix adding untracked files on directory rename (issue612) Fix from Brendan Added test case
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Jul 2007 16:01:07 -0500
parents 5eb02f9ed804
children 490e40816cbd
comparison
equal deleted inserted replaced
4748:8808ea7da86b 4819:9797124581c9