diff mercurial/lsprofcalltree.py @ 26518:a77679d0b887

filemerge: print correct name of tool for symlink checks Earlier we'd print ':merge' even if the tool was something else like ':union'. That's clearly a bug.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 00:24:44 -0700
parents beae42f3d93b
children 071af8d385a9
line wrap: on
line diff