hgbook

diff en/examples/rename.divergent.merge.out @ 273:00f69e8825c5

find changesets by author, revision, files, or words in the commit message
Bring book up to date with recent changes.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Nov 26 12:24:53 2007 -0800 (2007-11-26)
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	Mon Nov 26 12:24:53 2007 -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}