resolve merge conflict

Author: hhaensel

test/fmt.jl

@@ -20,24 +20,9 @@ i = 1234567
 @test fmt(i) == "1234567"
 @test fmt(i,:commas) == "1,234,567"
 
-# All Number types are now handled, default is right aligned string
+# These are not handled
 #@test_throws ErrorException fmt_default(Real)
 #@test_throws ErrorException fmt_default(Complex)
-fmt_default(Real) == fmt_default(Number) == FormatSpec('s', align = '>')
-
-@test fmt(2 - 3im, 10) == "   2 - 3im"
-@test fmt(pi - 3im, 15, 2) == "  3.14 - 3.00im"
-
-@test fmt(3//4, 10) == "      3//4"
-@test fmt(1//2 + 6//2 * im, 15) == " 1//2 + 3//1*im"
-
-fmt_default!(Rational, 'f', prec = 2)
-fmt_default!(Format.ComplexRational, 'f', prec = 2)
-
-@test fmt(3//4, 10, 2) == "      0.75"
-@test fmt(3//4, 10, 1) == "       0.8"
-@test fmt(1//2 + 6//2 * im, 23) == "  0.500000 + 3.000000im"
-@test fmt(1//2 + 6//2 * im, 15, 2) == "  0.50 + 3.00im"
 
 fmt_default!(Int, :commas, width = 12)
 @test fmt(i) == "   1,234,567"
@@ -63,3 +48,19 @@ v = pi
 
 v = MathConstants.eulergamma
 @test fmt(v, 10, 2) == "         γ"
+
+fmt_default(Real) == fmt_default(Number) == FormatSpec('s', align = '>')
+
+@test fmt(2 - 3im, 10) == "   2 - 3im"
+@test fmt(pi - 3im, 15, 2) == "  3.14 - 3.00im"
+
+@test fmt(3//4, 10) == "      3//4"
+@test fmt(1//2 + 6//2 * im, 15) == " 1//2 + 3//1*im"
+
+fmt_default!(Rational, 'f', prec = 2)
+fmt_default!(Format.ComplexRational, 'f', prec = 2)
+
+@test fmt(3//4, 10, 2) == "      0.75"
+@test fmt(3//4, 10, 1) == "       0.8"
+@test fmt(1//2 + 6//2 * im, 23) == "  0.500000 + 3.000000im"
+@test fmt(1//2 + 6//2 * im, 15, 2) == "  0.50 + 3.00im"