Changeset 1361 in tailor
- 04/24/07 20:08:14 (6 years ago)
- Hash name:
- 1 edited
r1347 r1361 125 125 126 126 if res: 127 # Uh, we have a conflict: this should not ever 128 # happen, but the user may have manually tweaked 129 # the working directory. Give her a chance of 130 # fixing the situation, or abort with Ctrl-C, or 131 # whatever the subclasses decide. 127 # We have a conflict. Give the user a chance of fixing 128 # the situation, or abort with Ctrl-C, or whatever the 129 # subclasses decide. 132 130 try: 133 131 self._handleConflict(c, conflicts, res)
Note: See TracChangeset for help on using the changeset viewer.