hgbook

diff en/examples/tour-merge-conflict @ 337:0aa96b0ffb65

find changesets by author, revision, files, or words in the commit message
Spanish version able to generate pdf and html
author Igor TAmara <igor@tamarapatino.org>
date Sun Oct 19 04:31:49 2008 -0500 (2008-10-19)
parents ceaca14e49f0
children bc14f94e726a
line diff
     1.1 --- a/en/examples/tour-merge-conflict	Tue Mar 06 20:46:07 2007 -0800
     1.2 +++ b/en/examples/tour-merge-conflict	Sun Oct 19 04:31:49 2008 -0500
     1.3 @@ -68,5 +68,6 @@
     1.4  Nigerian dictator Sani Abacha.
     1.5  EOF
     1.6  
     1.7 +hg resolve -m letter.txt
     1.8  hg commit -m 'Send me your money'
     1.9  hg tip