comparison docs/user-guide.rst @ 3579:3a4552b30ba8

compat: use mergetoolopts from commands.py Mercurial <= 4.2 do not have cmdutils.py yet.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 19:30:51 +0100
parents 83d2c9637e89
children 8406d9b06130
comparison
equal deleted inserted replaced
3578:10c3e69bb5bf 3579:3a4552b30ba8