/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_versionedfile.py

fix tests relying on trailing whitespace by replacing it with \x20.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_versionedfile.py
1154
1154
            """
1155
1155
        result = """\
1156
1156
            start context
1157
 
<<<<<<<
 
1157
<<<<<<<\x20
1158
1158
            int a() {}
1159
1159
=======
1160
1160
            int c() {}
1161
 
>>>>>>>
 
1161
>>>>>>>\x20
1162
1162
            end context
1163
1163
            """
1164
1164
        self._test_merge_from_strings(base, a, b, result)
1218
1218
            """
1219
1219
        result = """\
1220
1220
            start context
1221
 
<<<<<<<
 
1221
<<<<<<<\x20
1222
1222
            base line 1
1223
1223
            a's replacement line 2
1224
1224
=======
1225
1225
            b replaces
1226
1226
            both lines
1227
 
>>>>>>>
 
1227
>>>>>>>\x20
1228
1228
            end context
1229
1229
            """
1230
1230
        self._test_merge_from_strings(base, a, b, result)