hgbook

diff en/examples/backout @ 674:3b640272a966

find changesets by author, revision, files, or words in the commit message
Progres on resolve
author Bryan O'Sullivan <bos@serpentine.com>
date Sun Apr 12 00:05:30 2009 -0700 (2009-04-12)
parents 627effec9d4e
children 7226e5e750a6
line diff
     1.1 --- a/en/examples/backout	Tue Mar 06 21:36:14 2007 -0800
     1.2 +++ b/en/examples/backout	Sun Apr 12 00:05:30 2009 -0700
     1.3 @@ -6,7 +6,7 @@
     1.4  export HGMERGE=$(mktemp)
     1.5  echo '#!/bin/sh' >> $HGMERGE
     1.6  echo 'echo first change > "$1"' >> $HGMERGE
     1.7 -echo 'echo third change > "$1"' >> $HGMERGE
     1.8 +echo 'echo third change >> "$1"' >> $HGMERGE
     1.9  chmod 700 $HGMERGE
    1.10  
    1.11  #$ name: init