Mercurial > hg
diff tests/test-hgweb-json.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 | 71f692f1f678 |
children | 69d8fcf20014 |