View | Details | Raw Unified | Return to bug 115395
Collapse All | Expand All

(-)compare/org/eclipse/compare/internal/merge/TextStreamMerger.java (-3 / +3 lines)
Lines 53-59 Link Here
53
        }
53
        }
54
54
55
        try {
55
        try {
56
            char lineSeparator= '\n';
56
            String lineSeparator= System.getProperty("line.separator");
57
            
57
            
58
            RangeDifference[] diffs = RangeDifferencer.findRanges(monitor, a, t, o);
58
            RangeDifference[] diffs = RangeDifferencer.findRanges(monitor, a, t, o);
59
59
Lines 66-72 Link Here
66
                    for (int j = rd.rightStart(); j < rd.rightEnd(); j++) {
66
                    for (int j = rd.rightStart(); j < rd.rightEnd(); j++) {
67
                        String s= o.getLine(j);
67
                        String s= o.getLine(j);
68
                        output.write(s.getBytes(outputEncoding));
68
                        output.write(s.getBytes(outputEncoding));
69
                        output.write(lineSeparator);
69
                        output.write(lineSeparator.getBytes(outputEncoding));
70
                    }
70
                    }
71
                    break;
71
                    break;
72
72
Lines 74-80 Link Here
74
                    for (int j = rd.leftStart(); j < rd.leftEnd(); j++) {
74
                    for (int j = rd.leftStart(); j < rd.leftEnd(); j++) {
75
                        String s= t.getLine(j);
75
                        String s= t.getLine(j);
76
                        output.write(s.getBytes(outputEncoding));
76
                        output.write(s.getBytes(outputEncoding));
77
                        output.write(lineSeparator);
77
                        output.write(lineSeparator.getBytes(outputEncoding));
78
                    }
78
                    }
79
                    break;
79
                    break;
80
80

Return to bug 115395