pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/pretty.c b/pretty.c
index b2ee7fe9de2830dbc276b49d54a18d1130b751a2..d493cade26890d3e16ea072ced8e0f95679f5670 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -83,7 +83,7 @@ static int get_one_line(const char *msg)
 }
 
 /* High bit set, or ISO-2022-INT */
-int non_ascii(int ch)
+static int non_ascii(int ch)
 {
        return !isascii(ch) || ch == '\033';
 }