There are conflicts in jedit_de.props because it looks like you escaped a bunch of unicode characters that in props that were otherwise unchanged.
That was unintentional,
Please also merge r22376, then you get only the intended changes.
Also the changes to German_Keyboard_keys.props of revision r22375 should be merged with this merge request.
svn merge -c 22267 -c 22376 --accept mine-conflict https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/trunk
svn diff -c 22375 https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/trunk/keymaps/German_Keyboard_keys.props | patch -d keymaps
and then adding the CHANGES.txt entry at the proper place
should give the desired result.
Sign up for the SourceForge newsletter:
You seem to have CSS turned off.
Please don't fill out this field.