diff tests/test-import-bypass.t @ 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 76225ab5a5da
children 50f2966f86ca
line wrap: on
line diff