Mercurial > hg
log tests/test-pathconflicts-basic.t @ 52075:ff4562ed9ed7
| age | author | description |
|---|---|---|
| Fri, 29 Jan 2021 15:56:08 -0800 | Martin von Zweigbergk | errors: use StateError more in merge module |
| Sat, 13 Oct 2018 05:17:28 +0300 | Pulkit Goyal | py3: add some glob to make output compatible with python 3 |
| Mon, 08 Jan 2018 19:41:47 +0530 | Pulkit Goyal | merge: add `--abort` flag which can abort the merge |
| Tue, 24 Oct 2017 11:15:30 -0700 | Siddharth Agarwal | merge: disable path conflict checking by default (issue5716) stable |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | context: also consider path conflicts when clearing unknown files |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: check for path conflicts when merging (issue5628) |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: improve error messages for path conflicts during update |