view tests/test-cat.out @ 3387:ba7c74081861

merge: update dirstate correctly for non-branchmerge updates - we don't actually need the context in recordupdates - use -1 for filesize to force check on normal update - only record copy for branchmerges - forget moved files on update
author Matt Mackall <mpm@selenic.com>
date Fri, 13 Oct 2006 17:58:04 -0500
parents 7544700fd931
children
line wrap: on
line source

adding a
adding b
0
0
0
a: No such file in rev 03f6b0774996
1