hgbook

diff en/examples/tour-merge-conflict.son.out @ 356:0db175abfaf3

find changesets by author, revision, files, or words in the commit message
some friggin' merge or something like that.
author jerojasro@localhost
date Tue Oct 21 22:41:51 2008 -0500 (2008-10-21)
parents 006bbad1f190
children
line diff
     1.1 --- a/en/examples/tour-merge-conflict.son.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/tour-merge-conflict.son.out	Tue Oct 21 22:41:51 2008 -0500
     1.3 @@ -1,5 +1,6 @@
     1.4  $ \textbf{cd ..}
     1.5  $ \textbf{hg clone scam scam-son}
     1.6 +updating working directory
     1.7  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     1.8  $ \textbf{cd scam-son}
     1.9  $ \textbf{cat > letter.txt <<EOF}