Mercurial > hg
diff tests/test-issue619.out @ 11173:5b48d819d5f9
commit: note new branch heads rather than topological heads
Move to using contexts while we're at it.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 13 May 2010 17:24:21 -0500 |
parents | cdc458b12f0f |
children | 6e65b451b62e |
line wrap: on
line diff
--- a/tests/test-issue619.out Thu May 13 11:33:11 2010 -0500 +++ b/tests/test-issue619.out Thu May 13 17:24:21 2010 -0500 @@ -5,6 +5,7 @@ fast-forward 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) +created new head bogus fast-forward should fail abort: can't merge with ancestor done