diff mercurial/unionrepo.py @ 32256:9bc36198338e

debugcommands: add debugpickmergetool to examine which merge tool is chosen Before this patch, there is no convenient way to know which merge tool is chosen for each managed files without actual merging.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 13 May 2017 03:37:50 +0900
parents f1e0446e804c
children 634997248c97
line wrap: on
line diff