summaryrefslogtreecommitdiffstats
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--builtin/merge-recursive.c (renamed from builtin-merge-recursive.c)0
1 files changed, 0 insertions, 0 deletions
diff --git a/builtin-merge-recursive.c b/builtin/merge-recursive.c
index d8875d5892..d8875d5892 100644
--- a/builtin-merge-recursive.c
+++ b/builtin/merge-recursive.c