Mercurial > hg

log tests/test-pathconflicts-basic.t @ 38158:4e790f0966fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
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
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: check for path conflicts when updating (issue5628)
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas tests: add a test demonstrating basic path conflict failures
less more | (0) tip