Mercurial: File revisions

Mercurial Mercurial > hg / file revisions

summary | shortlog | changelog | graph | tags | bookmarks | branches | file | revisions | annotate | diff | comparison | rss | help
(0) tip

tests/test-pathconflicts-basic.t

Fri, 29 Jan 2021 15:56:08 -0800	Martin von Zweigbergk	errors: use StateError more in merge module	file \| diff \| annotate
Sat, 13 Oct 2018 05:17:28 +0300	Pulkit Goyal	py3: add some glob to make output compatible with python 3	file \| diff \| annotate
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) stable	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

less more (0) tip

Mercurial