hgbook

diff en/examples/tour-merge-conflict @ 356:0db175abfaf3

find changesets by author, revision, files, or words in the commit message
some friggin' merge or something like that.
author jerojasro@localhost
date Tue Oct 21 22:41:51 2008 -0500 (2008-10-21)
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	Tue Oct 21 22:41:51 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