hgbook

diff en/examples/branching.clone.out @ 356:0db175abfaf3

some friggin' merge or something like that.
author jerojasro@localhost
date Tue Oct 21 22:41:51 2008 -0500 (2008-10-21)
parents 5fc4a45c069f
children
line diff
     1.1 --- a/en/examples/branching.clone.out	Fri Mar 30 23:05:28 2007 -0700
     1.2 +++ b/en/examples/branching.clone.out	Tue Oct 21 22:41:51 2008 -0500
     1.3 @@ -5,4 +5,5 @@
     1.4  adding manifests
     1.5  adding file changes
     1.6  added 1 changesets with 1 changes to 1 files
     1.7 +updating working directory
     1.8  1 files updated, 0 files merged, 0 files removed, 0 files unresolved