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

login
register
mail settings
Submitter Yuya Nishihara
Date April 4, 2016, 3:07 p.m.
Message ID <344c9a96967758dee085.1459782455@mimosa>
Download mbox | patch
Permalink /patch/14347/
State Accepted
Delegated to: Martin von Zweigbergk
Headers show

Comments

Yuya Nishihara - April 4, 2016, 3:07 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@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

Patch

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,