Mercurial > hgbook
diff en/examples/results/tour-merge-conflict.commit.out @ 662:44d1363234d2
Move example output files into examples/results
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon, 09 Mar 2009 21:37:47 -0700 |
| parents | en/examples/tour-merge-conflict.commit.out@bc14f94e726a |
| children | 0d5935744f87 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/results/tour-merge-conflict.commit.out Mon Mar 09 21:37:47 2009 -0700 @@ -0,0 +1,16 @@ +$ \textbf{cat > letter.txt <<EOF} +> \textbf{Greetings!} +> \textbf{I am Bryan O'Sullivan, no relation of the former} +> \textbf{Nigerian dictator Sani Abacha.} +> \textbf{EOF} +$ \textbf{hg resolve -m letter.txt} +$ \textbf{hg commit -m 'Send me your money'} +$ \textbf{hg tip} +changeset: +tag: tip +parent: +parent: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Send me your money +