diff en/examples/tour-merge-conflict.commit.out @ 648:bc14f94e726a

Check in a known-broken example to fix up later - XXX

--- a/en/examples/tour-merge-conflict.commit.out	Thu Jan 29 22:46:56 2009 -0800
+++ b/en/examples/tour-merge-conflict.commit.out	Thu Jan 29 22:47:34 2009 -0800
@@ -4,29 +4,6 @@
 > \textbf{Nigerian dictator Sani Abacha.}
 > \textbf{EOF}
 $ \textbf{hg resolve -m letter.txt}
-hg: unknown command 'resolve'
-Mercurial Distributed SCM
-
-basic commands:
-
- add        add the specified files on the next commit
- annotate   show changeset information per file line
- clone      make a copy of an existing repository
- commit     commit the specified files or all outstanding changes
- diff       diff repository (or selected files)
- export     dump the header and diffs for one or more changesets
- init       create a new repository in the given directory
- log        show revision history of entire repository or files
- merge      merge working directory with another revision
- parents    show the parents of the working dir or revision
- pull       pull changes from the specified source
- push       push changes to the specified destination
- remove     remove the specified files on the next commit
- serve      export the repository via HTTP
- status     show changed files in the working directory
- update     update working directory
-
-use "hg help" for the full list of commands or "hg -v" for details
 $ \textbf{hg commit -m 'Send me your money'}
 $ \textbf{hg tip}
 changeset: