Mercurial > hg
comparison tests/test-dirstate-race.t @ 21552:61151f429a5f
update: introduce --tool for controlling the merge tool
Update is a kind of merge and may also need a merge tool and should have the
options described in the merge-tools help.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 19 May 2014 01:53:34 +0200 |
| parents | 28e2e3804f2e |
| children | c850f0ed54c1 |
comparison
equal
deleted
inserted
replaced
| 21551:bde505f47141 | 21552:61151f429a5f |
|---|