hgbook
diff en/examples/rename.divergent.merge.out @ 288:cac3ac4536e5
Better wording, again per Jim Blandy.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri Jan 18 12:01:46 2008 -0800 (2008-01-18) |
parents | 50223e198614 |
children |
line diff
1.1 --- a/en/examples/rename.divergent.merge.out Sat May 26 12:04:52 2007 -0700 1.2 +++ b/en/examples/rename.divergent.merge.out Fri Jan 18 12:01:46 2008 -0800 1.3 @@ -17,6 +17,9 @@ 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 +warning: detected divergent renames of foo to: 1.8 + bar 1.9 + quux 1.10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.11 (branch merge, don't forget to commit) 1.12 $ \textbf{ls}