trying to merge this results in conflict of entire file for jedit_cs.props as well as jedit_fr.props.
I guess svn:eol-style was set to native after branching 5.0.x. See this:
I did this commit on 5.0.x to make merging of my request (and others as well) easier. But I did only a precise one-file cut.
how do I merge it without clobbering the whole file though? Since it is all international stuff I can't really test/verify that I did things correctly otherwise.
Ah nevermind, all I had to do was propset the file before the merge.
Log in to post a comment.
Sign up for the SourceForge newsletter:
You seem to have CSS turned off.
Please don't fill out this field.