Mercurial > hgbook
comparison en/figs/bad-merge-2.dot @ 816:2c266a253b44
Merge with myself
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sun, 26 Apr 2009 23:23:06 -0700 |
| parents | 7226e5e750a6 |
| children |
comparison
equal
deleted
inserted
replaced
| 815:0ffae4ee4c47 | 816:2c266a253b44 |
|---|