Mercurial > hg
comparison tests/test-1102.t @ 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 | f2719b387380 |
children |
comparison
equal
deleted
inserted
replaced
26606:2a405d307f8c | 26607:45a6233d5f50 |
---|