Mercurial > hg
comparison mercurial/strutil.py @ 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 | 25e572394f5c |
| children | b723f05ec49b |
comparison
equal
deleted
inserted
replaced
| 21551:bde505f47141 | 21552:61151f429a5f |
|---|