Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: backup conflicting directories when getting files | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: add merge action 'pr' to rename files during update | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: add merge action 'p' to record path conflicts during update | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | commands: update the resolve command to handle path conflicts | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: add pathconflict merge state | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | tests: add a test demonstrating basic path conflict failures | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | scmutil: handle conflicting files and dirs in origbackuppath | changeset | files |
Sun, 01 Oct 2017 12:21:50 +0100 | Yuya Nishihara | extdata: show debug message if external command exits with non-zero status | changeset | files |