/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/conflicts.py

Merge cleanup into shell-like-tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
150
150
 
151
151
 
152
152
def restore(filename):
153
 
    """\
154
 
    Restore a conflicted file to the state it was in before merging.
155
 
    Only text restoration supported at present.
 
153
    """Restore a conflicted file to the state it was in before merging.
 
154
 
 
155
    Only text restoration is supported at present.
156
156
    """
157
157
    conflicted = False
158
158
    try: