hgbook
diff en/examples/backout.manual.merge.out @ 283:4ed483f08e33
Mention how to define mq alias.
author | Faheem Mitha <faheem@email.unc.edu> |
---|---|
date | Mon Dec 31 20:13:11 2007 -0800 (2007-12-31) |
parents | 006bbad1f190 |
children |
line diff
1.1 --- a/en/examples/backout.manual.merge.out Tue Mar 06 21:44:56 2007 -0800 1.2 +++ b/en/examples/backout.manual.merge.out Mon Dec 31 20:13:11 2007 -0800 1.3 @@ -4,4 +4,5 @@ 1.4 (branch merge, don't forget to commit) 1.5 $ \textbf{hg commit -m 'merged backout with previous tip'} 1.6 $ \textbf{cat myfile} 1.7 +first change 1.8 third change