hgbook
annotate en/examples/tour-merge-conflict.commit.out @ 543:51b5d56744c5
Merge Spanish version
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu Jan 29 22:00:07 2009 -0800 (2009-01-29) |
| parents | e281bd9a8e47 |
| children | bc14f94e726a |
| rev | line source |
|---|---|
| bos@144 | 1 $ \textbf{cat > letter.txt <<EOF} |
| bos@144 | 2 > \textbf{Greetings!} |
| bos@144 | 3 > \textbf{I am Bryan O'Sullivan, no relation of the former} |
| bos@144 | 4 > \textbf{Nigerian dictator Sani Abacha.} |
| bos@144 | 5 > \textbf{EOF} |
| hg@302 | 6 $ \textbf{hg resolve -m letter.txt} |
| jerojasro@334 | 7 hg: unknown command 'resolve' |
| jerojasro@334 | 8 Mercurial Distributed SCM |
| jerojasro@334 | 9 |
| jerojasro@334 | 10 basic commands: |
| jerojasro@334 | 11 |
| jerojasro@334 | 12 add add the specified files on the next commit |
| jerojasro@334 | 13 annotate show changeset information per file line |
| jerojasro@334 | 14 clone make a copy of an existing repository |
| jerojasro@334 | 15 commit commit the specified files or all outstanding changes |
| jerojasro@334 | 16 diff diff repository (or selected files) |
| jerojasro@334 | 17 export dump the header and diffs for one or more changesets |
| jerojasro@334 | 18 init create a new repository in the given directory |
| jerojasro@334 | 19 log show revision history of entire repository or files |
| jerojasro@334 | 20 merge merge working directory with another revision |
| jerojasro@334 | 21 parents show the parents of the working dir or revision |
| jerojasro@334 | 22 pull pull changes from the specified source |
| jerojasro@334 | 23 push push changes to the specified destination |
| jerojasro@334 | 24 remove remove the specified files on the next commit |
| jerojasro@334 | 25 serve export the repository via HTTP |
| jerojasro@334 | 26 status show changed files in the working directory |
| jerojasro@334 | 27 update update working directory |
| jerojasro@334 | 28 |
| jerojasro@334 | 29 use "hg help" for the full list of commands or "hg -v" for details |
| bos@144 | 30 $ \textbf{hg commit -m 'Send me your money'} |
| bos@144 | 31 $ \textbf{hg tip} |
| bos@144 | 32 changeset: |
| bos@144 | 33 tag: tip |
| bos@144 | 34 parent: |
| bos@144 | 35 parent: |
| bos@144 | 36 user: Bryan O'Sullivan <bos@serpentine.com> |
| bos@144 | 37 |
| bos@144 | 38 summary: Send me your money |
| bos@144 | 39 |