Mercurial > hg
comparison tests/test-merge1.t @ 31166:fad5e299cfc7
update: accept --merge to allow merging across topo branches (issue5125)
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 13 Feb 2017 12:58:37 -0800 |
| parents | 1e4512eac59e |
| children | 2428e8ec0793 |
comparison
equal
deleted
inserted
replaced
| 31165:81250d377611 | 31166:fad5e299cfc7 |
|---|