##// END OF EJS Templates
merge: check for untracked files more precisely (issue3400)...
merge: check for untracked files more precisely (issue3400) This fixes the regression, but still leaves the long-standing issue that merge doesn't cope with trying to merge files and directories.

File last commit:

r16085:94aa8a41 default
r16534:11212bab stable
Show More
de.po
0 lines | 657.2 KiB | application/x-gettext
File size 657.2 KiB is bigger then allowed limit 515.6 KiB. Show as raw