Mercurial > hgbook

diff en/examples/tour-merge-conflict @ 401:e281bd9a8e47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix sample output for test 'tour-merge-conflict'. Fix test itself as well (now requires 'hg resolve').
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 22:00:46 +0200
parents ceaca14e49f0
children bc14f94e726a
line wrap: on
line diff
--- a/en/examples/tour-merge-conflict	Wed Aug 20 21:58:19 2008 +0200
+++ b/en/examples/tour-merge-conflict	Wed Aug 20 22:00:46 2008 +0200
@@ -68,5 +68,6 @@
 Nigerian dictator Sani Abacha.
 EOF
 
+hg resolve -m letter.txt
 hg commit -m 'Send me your money'
 hg tip