Mercurial > public > mercurial-scm > hg-stable

diff tests/failfilemerge.py @ 28772:424c1632fffb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: sort import lines in failfilemerge.py
author Yuya Nishihara <yuya@tcha.org>
date Sun, 03 Apr 2016 19:41:00 +0900
parents 61f4d59e9a0b
children a7f8939641aa
line wrap: on
line diff
--- 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,