Before this change, if git-mergetool was invoked with regard to
files with a percent sign (%) in their names, it would print an
error. For example, if you were calling mergetool on a file called

    printf: %2F: invalid directive

This changes the behavior to pass "%s" to printf as its first argument
to avoid processing the filename as a format string.

Signed-off-by: Asheesh Laroia <>
--- |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ b/
index c50e18a..d2b9289 100755
--- a/
+++ b/
@@ -440,7 +440,7 @@ then
 printf "Merging:\n"
-printf "$files\n"
+printf "%s" "$files\n"

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to