hgbook
diff en/examples/tour-merge-conflict.commit.out @ 549:bc14f94e726a
Check in a known-broken example to fix up later - XXX
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu Jan 29 22:47:34 2009 -0800 (2009-01-29) |
parents | 83790457e85b |
children |
line diff
1.1 --- a/en/examples/tour-merge-conflict.commit.out Sat Oct 18 12:07:16 2008 -0500 1.2 +++ b/en/examples/tour-merge-conflict.commit.out Thu Jan 29 22:47:34 2009 -0800 1.3 @@ -4,29 +4,6 @@ 1.4 > \textbf{Nigerian dictator Sani Abacha.} 1.5 > \textbf{EOF} 1.6 $ \textbf{hg resolve -m letter.txt} 1.7 -hg: unknown command 'resolve' 1.8 -Mercurial Distributed SCM 1.9 - 1.10 -basic commands: 1.11 - 1.12 - add add the specified files on the next commit 1.13 - annotate show changeset information per file line 1.14 - clone make a copy of an existing repository 1.15 - commit commit the specified files or all outstanding changes 1.16 - diff diff repository (or selected files) 1.17 - export dump the header and diffs for one or more changesets 1.18 - init create a new repository in the given directory 1.19 - log show revision history of entire repository or files 1.20 - merge merge working directory with another revision 1.21 - parents show the parents of the working dir or revision 1.22 - pull pull changes from the specified source 1.23 - push push changes to the specified destination 1.24 - remove remove the specified files on the next commit 1.25 - serve export the repository via HTTP 1.26 - status show changed files in the working directory 1.27 - update update working directory 1.28 - 1.29 -use "hg help" for the full list of commands or "hg -v" for details 1.30 $ \textbf{hg commit -m 'Send me your money'} 1.31 $ \textbf{hg tip} 1.32 changeset: