view tests/test-atomictempfile.py.out @ 15673:d550168f11ce stable

merge: check filename case collision between changesets for branch merging this patch makes branch merging abort when merged changesets have same file in different case on case insensitive filesystem. this patch does not prevent linear update which merges between target and working contexts, because 'branchmerge' is False in such case.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Fri, 16 Dec 2011 21:21:27 +0900
parents d764463b433e
children
line wrap: on
line source

OK
OK
OK