hgbook

view ja/examples/tour-merge-conflict.merge.out @ 1114:527b86d55d4a

find changesets by author, revision, files, or words in the commit message
inotify: update installation information

inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sun Dec 13 16:35:56 2009 +0900 (2009-12-13)
parents
children
line source
1 $ \textbf{export HGMERGE=merge}
2 $ \textbf{hg merge}
3 merging letter.txt
4 merge: warning: conflicts during merge
5 merging letter.txt failed!
6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
7 There are unresolved merges, you can redo the full merge using:
8 hg update -C 1
9 hg merge 2
10 $ \textbf{cat letter.txt}
11 Greetings!
12
13 I am Shehu Musa Abacha, cousin to the former
14 =======
15 I am Alhaji Abba Abacha, son of the former
16
17 Nigerian dictator Sani Abacha.