Mercurial > hg
diff tests/test-issue2137.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 | 2fc86d92c4a9 |
children | c4ccc73f9d49 |