Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 768:20e95c245bc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH
author mpm@selenic.com
date Sat, 23 Jul 2005 10:00:56 -0500
parents 61ed30e82b27
children 122449dd89db 445970ccf57a
comparison
equal deleted inserted replaced
767:61ed30e82b27 768:20e95c245bc3
68 1 68 1
69 69
70 70
71 + hg diff 71 + hg diff
72 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' 72 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
73 diff -r 1e71731e6fbb a
74 --- a/a
75 +++ b/a
76 @@ -1,1 +1,1 @@
77 -a2
78 +abc