Browse Source
Merges are performed using the raw text as stored in the git repository. When we write the merge result, we must apply the correct CRLF settings. Otherwise the line endings in the result will be wrong. Bug: 499615 Change-Id: I37a9b987e9404c97645d2720cd1c7c04c076a96b Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>stable-4.11
Thomas Wolf
7 years ago
committed by
Matthias Sohn
4 changed files with 71 additions and 13 deletions
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
||||
<component id="org.eclipse.jgit" version="2"> |
||||
<resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger"> |
||||
<filter id="336658481"> |
||||
<message_arguments> |
||||
<message_argument value="org.eclipse.jgit.merge.ResolveMerger"/> |
||||
<message_argument value="workingTreeOptions"/> |
||||
</message_arguments> |
||||
</filter> |
||||
</resource> |
||||
</component> |
Loading…
Reference in new issue