Fix typo

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/gitmergeonefile.py b/stgit/gitmergeonefile.py
index c1af2f85f82c315e89593cadbdcf3e9aef8344a2..55b62db1e7a624885d4aa5a155e72af02f921908 100644 (file)
--- a/stgit/gitmergeonefile.py
+++ b/stgit/gitmergeonefile.py
@@ -264,7 +264,7 @@ def merge(orig_hash, file1_hash, file2_hash,
                     __conflict(path)
                     return 1
                 if file1_mode != file2_mode:
-                    out.error('File "s" added in both, permissions conflict'
+                    out.error('File "%s" added in both, permissions conflict'
                               % path)
                     __conflict(path)
                     return 1