comparison mercurial/encoding.py @ 26573:a875773cf537

filemerge._idump: 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:17:31 -0700
parents 328739ea70c3
children cf47bdb2183c
comparison
equal deleted inserted replaced
26572:c7850af6bb75 26573:a875773cf537