Mercurial > hgbook
comparison en/examples/branching @ 191:f078515438d2
Account for changed output.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 16 Apr 2007 14:39:20 -0700 |
parents | 5fc4a45c069f |
children |
comparison
equal
deleted
inserted
replaced
190:cd066590e2e3 | 191:f078515438d2 |
---|---|
37 | 37 |
38 hg clone stable stable-fix | 38 hg clone stable stable-fix |
39 cd stable-fix | 39 cd stable-fix |
40 echo 'This is a fix to a boring feature.' > myfile | 40 echo 'This is a fix to a boring feature.' > myfile |
41 hg commit -m 'Fix a bug' | 41 hg commit -m 'Fix a bug' |
42 #$ ignore: /tmp/branching.* | |
42 hg push | 43 hg push |
43 | 44 |
44 #$ name: | 45 #$ name: |
45 | 46 |
46 export HGMERGE=$(mktemp) | 47 export HGMERGE=$(mktemp) |