Merge branch 'sd/t3200-branch-m-test'

diff --git a/apply.c b/apply.c
index 854faa67795bcd356b33420f46260f208c2ec047..679ed7732d2385c4d7704f60335514b2b5f75c39 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -762,17 +762,6 @@ static char *find_name_traditional(struct apply_state *state,
        return find_name_common(state, line, def, p_value, line + len, 0);
 }
 
-static int count_slashes(const char *cp)
-{
-       int cnt = 0;
-       char ch;
-
-       while ((ch = *cp++))
-               if (ch == '/')
-                       cnt++;
-       return cnt;
-}
-
 /*
  * Given the string after "--- " or "+++ ", guess the appropriate
  * p_value for the given patch.