comparison mercurial/formatter.py @ 26605:ef21a2c41629

filemerge: add a wrapper around the filemerge function We'll introduce a separate premerge function that calls the same code.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 12:31:08 -0700
parents 56b2bcea2529
children 3356bf61fa25
comparison
equal deleted inserted replaced
26604:a3fcc8e3136b 26605:ef21a2c41629