From: Karl Hasselström <kha@treskal.com>
Date: Sun, 28 Sep 2008 12:32:12 +0000 (+0200)
Subject: Fix typo
X-Git-Tag: v0.15-rc1~49^2~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/7cb253c05b509510177a1df4d5813861641968f6

Fix typo

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

diff --git a/stgit/gitmergeonefile.py b/stgit/gitmergeonefile.py
index c1af2f8..55b62db 100644
--- 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