1 Commits

Author	SHA1	Message	Date
FUJIWARA Katsunori	1a00d3603f	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.	2011-12-16 21:21:27 +09:00