diff --git a/src/template.jl b/src/template.jl
index bf59e3f..f83bf65 100644
--- a/src/template.jl
+++ b/src/template.jl
@@ -215,7 +215,7 @@ function interactive_template(; fast::Bool=false)
         Dict()
     else
         gitconfig = Dict()
-        print("Enter any Git key-value pairs (one at a time, separated by spaces) [None]: ")
+        print("Enter any Git key-value pairs (one per line, separated by spaces) [None]: ")
         while true
             line = readline()
             isempty(line) && break
diff --git a/test/interactive/interactive.jl b/test/interactive/interactive.jl
index fa1987c..41aa5d4 100644
--- a/test/interactive/interactive.jl
+++ b/test/interactive/interactive.jl
@@ -25,7 +25,7 @@
         @test_throws ArgumentError t = interactive_template()
     end
 
-    write(STDIN.buffer, "$me\ngitlab.com\n$('\x1b')[B\r$me\n2016\n$test_file\nno\n0.5\nX Y\nA B\n\n$('\x1b')[B\r$('\x1b')[B\rd\n\n")
+    write(STDIN.buffer, "$me\ngitlab.com\n$('\x1b')[B\r$me\n2016\n$test_file\nno\n0.5\nX Y\nkey val val\nkey2 val2\n\n$('\x1b')[B\r$('\x1b')[B\rd\n\n")
     t = interactive_template()
     @test t.user == me
     @test t.host == "gitlab.com"
@@ -37,7 +37,7 @@
     @test !t.precompile
     @test t.julia_version == v"0.5.0"
     @test Set(t.requirements) == Set(["X", "Y"])
-    @test t.gitconfig == Dict("A" => "B")
+    @test t.gitconfig == Dict("key" => "val val", "key2" => "val2")
     # Like above, not sure which plugins this will generate.
     @test length(t.plugins) == 2