comparison mercurial/templates/map-cmdline.bisect @ 26572:c7850af6bb75

filemerge._merge: drop no longer necessary 'if r:' check Cleanup from an earlier patch to make premerge be directly called from the main filemerge function.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 08 Oct 2015 14:16:19 -0700
parents 7c324f65e4ef
children f4aeb952ab77
comparison
equal deleted inserted replaced
26571:a024e2db4553 26572:c7850af6bb75