##// END OF EJS Templates
icasefs: make case-folding collision detection as rename aware (issue3370)...
icasefs: make case-folding collision detection as rename aware (issue3370) if the file in target context causes case-folding collision against one in working context, current implementation aborts merging with it, even thouhg collding one (in target) is the file renamed from collided one (in working). this patch uses file copy information to know whether colliding file is renamed from collided one or not: if so, collision between them is ignored. this patch also avoids collision detection between current context and target context, if working context is clean (with --check/-c) or will be clean (with --clean/-C).

File last commit:

r16442:9181188f default
r16478:cbf2ea2f stable
Show More
9diff.rc
7 lines | 177 B | text/x-stsrc | TextLexer
# The 9diff extdiff command generates diff(1) compatible output
# suitable for use with the plumber(4).
[extensions]
extdiff =
[extdiff]
9diff = 9diff -cm $parent $child $root