Mercurial > hgbook
diff en/examples/backout @ 179:5fc4a45c069f
Continue documentation of collaboration models.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 30 Mar 2007 23:05:28 -0700 |
parents | 627effec9d4e |
children | 7226e5e750a6 |
line wrap: on
line diff
--- a/en/examples/backout Thu Mar 29 19:55:18 2007 +0100 +++ b/en/examples/backout Fri Mar 30 23:05:28 2007 -0700 @@ -6,7 +6,7 @@ export HGMERGE=$(mktemp) echo '#!/bin/sh' >> $HGMERGE echo 'echo first change > "$1"' >> $HGMERGE -echo 'echo third change > "$1"' >> $HGMERGE +echo 'echo third change >> "$1"' >> $HGMERGE chmod 700 $HGMERGE #$ name: init