Mercurial > hg
comparison mercurial/simplemerge.py @ 33788:0531ffd59a98
drawdag: allow override file contents via comments
This makes drawdag more flexible, and allow us to create non-clean merges in
test cases.
Differential Revision: https://phab.mercurial-scm.org/D385
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Mon, 14 Aug 2017 07:02:38 -0700 |
| parents | c31d45623304 |
| children | de573184686e |
comparison
equal
deleted
inserted
replaced
| 33787:fa3aa6c98bb7 | 33788:0531ffd59a98 |
|---|