hgbook
diff en/examples/tour-merge-conflict.commit.out @ 302:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
Fix test itself as well (now requires 'hg resolve').
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed Aug 20 22:00:46 2008 +0200 (2008-08-20) |
parents | 006bbad1f190 |
children | 83790457e85b |
line diff
1.1 --- a/en/examples/tour-merge-conflict.commit.out Tue Mar 06 21:44:56 2007 -0800 1.2 +++ b/en/examples/tour-merge-conflict.commit.out Wed Aug 20 22:00:46 2008 +0200 1.3 @@ -3,6 +3,7 @@ 1.4 > \textbf{I am Bryan O'Sullivan, no relation of the former} 1.5 > \textbf{Nigerian dictator Sani Abacha.} 1.6 > \textbf{EOF} 1.7 +$ \textbf{hg resolve -m letter.txt} 1.8 $ \textbf{hg commit -m 'Send me your money'} 1.9 $ \textbf{hg tip} 1.10 changeset: