Mercurial > public > mercurial-scm > hg

comparison mercurial/simplemerge.py @ 16687:e34106fa0dc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: "raise SomeException()" -> "raise SomeException"
author Brodie Rao <brodie@sf.io>
date Sat, 12 May 2012 16:00:58 +0200
parents 525fdb738975
children 4aeb7a6029ba
comparison
equal deleted inserted replaced
16686:67964cda8701 16687:e34106fa0dc3
92 if self.a[0].endswith('\r\n'): 92 if self.a[0].endswith('\r\n'):
93 newline = '\r\n' 93 newline = '\r\n'
94 elif self.a[0].endswith('\r'): 94 elif self.a[0].endswith('\r'):
95 newline = '\r' 95 newline = '\r'
96 if base_marker and reprocess: 96 if base_marker and reprocess:
97 raise CantReprocessAndShowBase() 97 raise CantReprocessAndShowBase
98 if name_a: 98 if name_a:
99 start_marker = start_marker + ' ' + name_a 99 start_marker = start_marker + ' ' + name_a
100 if name_b: 100 if name_b:
101 end_marker = end_marker + ' ' + name_b 101 end_marker = end_marker + ' ' + name_b
102 if name_base and base_marker: 102 if name_base and base_marker: