Mercurial > hgbook

annotate en/examples/tour-merge-conflict.merge.out @ 521:59fbfb7e790c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
translated some more comments
author Javier Rojas <jerojasro@devnull.li>
date Mon, 17 Nov 2008 20:04:37 -0500
parents 83790457e85b
children bc14f94e726a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{export HGMERGE=merge}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 $ \textbf{hg merge}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 merging letter.txt
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 merge: warning: conflicts during merge
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 merging letter.txt failed!
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
433
83790457e85b modifications to generate the examples for the book
jerojasro@localhost
parents: 401
diff changeset
7 There are unresolved merges, you can redo the full merge using:
83790457e85b modifications to generate the examples for the book
jerojasro@localhost
parents: 401
diff changeset
8 hg update -C 1
83790457e85b modifications to generate the examples for the book
jerojasro@localhost
parents: 401
diff changeset
9 hg merge 2
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 $ \textbf{cat letter.txt}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 Greetings!
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 I am Shehu Musa Abacha, cousin to the former
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14 =======
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 I am Alhaji Abba Abacha, son of the former
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
17 Nigerian dictator Sani Abacha.