comparison tests/test-strip-cross.t @ 26574:f82cb7dffb49

filemerge._xmerge: 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:18:43 -0700
parents aa9385f983fa
children 009d0283de5f
comparison
equal deleted inserted replaced
26573:a875773cf537 26574:f82cb7dffb49