Mercurial > hg-stable
comparison mercurial/commandserver.py @ 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 | 5d6f984c8375 |
| children | 5f2a308bac94 |
comparison
equal
deleted
inserted
replaced
| 27740:da5634e1b8a3 | 27741:3951f132958f |
|---|