Mercurial > hgbook
comparison en/examples/tour-merge-conflict @ 648:bc14f94e726a
Check in a known-broken example to fix up later - XXX
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu, 29 Jan 2009 22:47:34 -0800 |
| parents | e281bd9a8e47 |
| children | 4e23c220d1b0 |
comparison
equal
deleted
inserted
replaced
| 647:5ffee9123bbf | 648:bc14f94e726a |
|---|---|
| 54 | 54 |
| 55 #$ name: merge | 55 #$ name: merge |
| 56 #$ ignore: [<>]{7} /tmp/.* | 56 #$ ignore: [<>]{7} /tmp/.* |
| 57 | 57 |
| 58 export HGMERGE=merge | 58 export HGMERGE=merge |
| 59 echo 'XXX this is broken and must be fixed' | |
| 59 hg merge | 60 hg merge |
| 60 cat letter.txt | 61 cat letter.txt |
| 61 | 62 |
| 62 #$ name: commit | 63 #$ name: commit |
| 63 | 64 |