equal
deleted
inserted
replaced
192 The --merge option remembers the parent of the working directory |
192 The --merge option remembers the parent of the working directory |
193 before starting the backout, then merges the new head with that |
193 before starting the backout, then merges the new head with that |
194 changeset afterwards. This saves you from doing the merge by hand. |
194 changeset afterwards. This saves you from doing the merge by hand. |
195 The result of this merge is not committed, as with a normal merge. |
195 The result of this merge is not committed, as with a normal merge. |
196 |
196 |
197 See \'hg help dates\' for a list of formats valid for -d/--date. |
197 See 'hg help dates' for a list of formats valid for -d/--date. |
198 ''' |
198 ''' |
199 if rev and node: |
199 if rev and node: |
200 raise util.Abort(_("please specify just one revision")) |
200 raise util.Abort(_("please specify just one revision")) |
201 |
201 |
202 if not rev: |
202 if not rev: |