Mercurial > hg-stable
diff contrib/hgperf @ 27741:3951f132958f
merge: determine what untracked conflicts cause warns and aborts separately
This is written in a somewhat weird style, but it's designed for code reuse in
an upcoming patch.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 12 Jan 2016 18:17:07 -0800 |
parents | 377a111d1cd2 |
children | 22fbca1d11ed |