| Fri, 29 Jan 2021 15:56:08 -0800 | Martin von Zweigbergk | errors: use StateError more in merge module | file | diff | annotate |
| Mon, 12 Oct 2020 12:44:18 -0700 | Martin von Zweigbergk | errors: introduce StateError and use it from commands and cmdutil | file | diff | annotate |
| Tue, 24 Oct 2017 11:15:30 -0700 | Siddharth Agarwal | merge: disable path conflict checking by default (issue5716) | file | diff | annotate |
| Sat, 14 Oct 2017 01:07:59 -0400 | Matt Harbison | test-conflicts: conditionalize for no-symlink platforms | file | diff | annotate |
| Tue, 10 Oct 2017 11:03:14 -0400 | Augie Fackler | tests: use readlink.py instead of readlink | file | diff | annotate |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | tests: add test for path conflicts during update | file | diff | annotate |