Mercurial > hg
log
age | author | description |
---|---|---|
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | commands: tidy up merge state decoding in resolve |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | tests: add test for path conflicts during merge |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | tests: add test for path conflicts during update |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | context: also consider path conflicts when clearing unknown files |