← Back to branch summary

~ubuntu-branches/debian/sid/tortoisehg/sid

« back to all changes in this revision

Viewing changes to tortoisehg/hgqt/backout.py

  • Committer: Package Import Robot
  • Author(s): Ludovico Cavedon
  • Date: 2012-05-29 00:59:17 UTC
  • mfrom: (1.2.9)
  • Revision ID: package-import@ubuntu.com-20120529005917-ae1mdohuiimxxkc0
Tags: 2.4-1
http://bugs.debian.org/671473
https://launchpad.net/bugs/990527
* Imported Upstream version 2.4 (Closes: #671473).
* Re-add Nautilus extension (LP: #990527).
* Update Standards-Version to 3.9.3.
* Update copyright format.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tortoisehg/hgqt/backout.py
5
5
# This software may be used and distributed according to the terms of the
6
6
# GNU General Public License version 2, incorporated herein by reference.
7
7
 
8
 
from mercurial import hg, merge as mergemod
 
8
from mercurial import error, hg, merge as mergemod
9
9
 
10
10
from tortoisehg.util import hglib
11
11
from tortoisehg.hgqt.i18n import _