diff en/examples/tour-merge-conflict @ 379:dbc78b312fc0
finished translation of tour-basic
author |
Javier Rojas <jerojasro@devnull.li> |
date |
Mon Oct 27 23:29:24 2008 -0500 (2008-10-27) |
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 Mon Oct 27 23:29:24 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