equal
deleted
inserted
replaced
161 total += 1 |
161 total += 1 |
162 |
162 |
163 if mergeable_file: |
163 if mergeable_file: |
164 linesperrev = 2 |
164 linesperrev = 2 |
165 # make a file with k lines per rev |
165 # make a file with k lines per rev |
166 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)] |
166 initialmergedlines = ['%d' % i for i in xrange(0, total * linesperrev)] |
167 initialmergedlines.append("") |
167 initialmergedlines.append("") |
168 |
168 |
169 tags = [] |
169 tags = [] |
170 |
170 |
171 wlock = lock = tr = None |
171 wlock = lock = tr = None |