hgbook
diff en/examples/results/tour-merge-conflict.commit.out @ 563:44d1363234d2
Move example output files into examples/results
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Mar 09 21:37:47 2009 -0700 (2009-03-09) |
parents | en/examples/tour-merge-conflict.commit.out@bc14f94e726a |
children | 0d5935744f87 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/results/tour-merge-conflict.commit.out Mon Mar 09 21:37:47 2009 -0700 1.3 @@ -0,0 +1,16 @@ 1.4 +$ \textbf{cat > letter.txt <<EOF} 1.5 +> \textbf{Greetings!} 1.6 +> \textbf{I am Bryan O'Sullivan, no relation of the former} 1.7 +> \textbf{Nigerian dictator Sani Abacha.} 1.8 +> \textbf{EOF} 1.9 +$ \textbf{hg resolve -m letter.txt} 1.10 +$ \textbf{hg commit -m 'Send me your money'} 1.11 +$ \textbf{hg tip} 1.12 +changeset: 1.13 +tag: tip 1.14 +parent: 1.15 +parent: 1.16 +user: Bryan O'Sullivan <bos@serpentine.com> 1.17 + 1.18 +summary: Send me your money 1.19 +