Mercurial > hg

log tests/test-pathconflicts-merge.t @ 35065:a1de4ffaa7a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Tue, 24 Oct 2017 11:15:30 -0700 Siddharth Agarwal merge: disable path conflict checking by default (issue5716) stable
Tue, 10 Oct 2017 11:02:53 -0400 Augie Fackler tests: use readlink.py instead of readlink
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas tests: add test for path conflicts during merge
less more | (0) tip