Mercurial > hg
diff tests/test-rebase-scenario-global.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 | 5b70ece79ea7 |
children | 4dd9f606d0a6 |