comparison tests/test-trusted.py.out @ 26607:45a6233d5f50

filemerge: introduce a premerge flag and function This flag will let us get to our overall goal of performing all premerges before any merges.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 20:47:04 -0700
parents fa91ddfc3f36
children c4040a35b5d9
comparison
equal deleted inserted replaced
26606:2a405d307f8c 26607:45a6233d5f50