hgbook
diff en/examples/daily.copy.merge.out @ 549:bc14f94e726a
Check in a known-broken example to fix up later - XXX
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu Jan 29 22:47:34 2009 -0800 (2009-01-29) |
parents | 83790457e85b |
children |
line diff
1.1 --- a/en/examples/daily.copy.merge.out Sat Oct 18 12:07:16 2008 -0500 1.2 +++ b/en/examples/daily.copy.merge.out Thu Jan 29 22:47:34 2009 -0800 1.3 @@ -7,7 +7,7 @@ 1.4 added 1 changesets with 1 changes to 1 files (+1 heads) 1.5 (run 'hg heads' to see heads, 'hg merge' to merge) 1.6 $ \textbf{hg merge} 1.7 -merging file and new-file 1.8 +merging file and new-file to new-file 1.9 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 1.10 (branch merge, don't forget to commit) 1.11 $ \textbf{cat new-file}