Mercurial > hg
diff hgext/censor.py @ 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 | 56b2bcea2529 |
children | 1aee2ab0f902 |