Mercurial > hg
diff mercurial/filemerge.py @ 7873:4a4c7f6a5912
cleanup: drop unused imports
| author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
|---|---|
| date | Mon, 23 Mar 2009 13:12:07 +0100 |
| parents | 4c92d8971809 |
| children | a1a5a57efe90 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Mon Mar 23 13:12:03 2009 +0100 +++ b/mercurial/filemerge.py Mon Mar 23 13:12:07 2009 +0100 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. -from node import nullrev, short +from node import short from i18n import _ import util, os, tempfile, simplemerge, re, filecmp