[PATCH 2 of 9] tests: sort import lines in failfilemerge.py

Yuya Nishihara yuya at tcha.org
Mon Apr 4 11:07:35 EDT 2016


# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1459680060 -32400
#      Sun Apr 03 19:41:00 2016 +0900
# Node ID 344c9a96967758dee0850525719636a77efcad18
# Parent  9f464eb9b73b47c5420264774b373ce049ad9148
tests: sort import lines in failfilemerge.py

diff --git a/tests/failfilemerge.py b/tests/failfilemerge.py
--- a/tests/failfilemerge.py
+++ b/tests/failfilemerge.py
@@ -3,9 +3,9 @@
 from __future__ import absolute_import
 
 from mercurial import (
+    error,
+    extensions,
     filemerge,
-    extensions,
-    error,
 )
 
 def failfilemerge(filemergefn,


More information about the Mercurial-devel mailing list