Still the same problem. There is somehting weird in your patches (10 and 11 I mean). It comes from LabelManagerFactory.java. There seems to be duplicated blank lines in the patch. I don't know if it comes from the java file or patch creation.
The 1st error appears at line 11. I was able to fix it by removing this blank line. But then I got trap with line 63 again. Then I used Scite with menu option View/End Of Line checked, and I then see (on Windows) strange LFs in green (there are also LFs in other colors that I'm used to see). I tried to remove only the line 63, but then got the same problem in line 64. So I removed (by hand, not doable with replace feature apparently) all the green LFs and was able to merge.
These green LFs don't appear in FileUtil.java. Really weird... I searched an explanation Googling for "Scite green LF" an "Scite colored end of line" but find nothing clear...
I already tried in previous attemps to replace LF by CRLF but it does not fix the merging issue. Please could you check your both other java files ? It would be better to find the reason, if possible, than to have to deal with that later
Also I removed a tab in
+ labels.remove(key + keySeparator + fileName);
and fixed a small bug in UpdateLabel.ftl
<#assign labelVal = (label.getLabelValue(localeFound))?if_exists>
I attach the modified patch (without green LFs), HTH
Finally your patch is in trunk at revision: 737382.
It seems to work well, but I have still to check the 32 XML files I modified while only adding a l10n for key "ebay" in French, great work