| Mon, 08 Jan 2018 19:41:47 +0530 | Pulkit Goyal | merge: add `--abort` flag which can abort the merge | file | diff | annotate |
| Tue, 24 Oct 2017 11:15:30 -0700 | Siddharth Agarwal | merge: disable path conflict checking by default (issue5716) | file | diff | annotate |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | context: also consider path conflicts when clearing unknown files | file | diff | annotate |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: check for path conflicts when merging (issue5628) | file | diff | annotate |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: improve error messages for path conflicts during update | file | diff | annotate |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: check for path conflicts when updating (issue5628) | file | diff | annotate |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | tests: add a test demonstrating basic path conflict failures | file | diff | annotate |