Mercurial > hg
diff mercurial/dummycert.pem @ 27126:72b4e1bf8f28
test-merge-changedelete.t: add resolve --list output
We're going to move change/delete conflicts to the resolve phase, and the
resolve --list output is one of the things that will be important to test.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Mon, 23 Nov 2015 13:45:56 -0800 |
parents | d7f7f1860f00 |
children |