Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: sort import lines in failfilemerge.py
authorYuya Nishihara <yuya@tcha.org>
Sun, 03 Apr 2016 19:41:00 +0900
changeset 28772 424c1632fffb
parent 28771 9366b18ba103
child 28773 0023a6e1328f
tests: sort import lines in failfilemerge.py
tests/failfilemerge.py file | annotate | diff | comparison | revisions 
--- a/tests/failfilemerge.py	Sun Apr 03 19:40:05 2016 +0900
+++ b/tests/failfilemerge.py	Sun Apr 03 19:41:00 2016 +0900
@@ -3,9 +3,9 @@
 from __future__ import absolute_import
 
 from mercurial import (
-    filemerge,
+    error,
     extensions,
-    error,
+    filemerge,
 )
 
 def failfilemerge(filemergefn,
Mercurial