log mercurial/filemerge.py @ 27039:d7517deedf86

age author description
Sun, 15 Nov 2015 21:40:15 -0800 Siddharth Agarwal filemerge._picktool: only pick from nomerge tools for change/delete conflicts