merge: add scissors line on merge conflict

diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index b22b1a0539de206f6f2328fc0f7e1e7190b63ff1..48c5e78e339dbd32db255382f729ca2e65b514c5 100644 (file)
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -3,6 +3,7 @@
 #include "progress.h"
 #include "parse-options.h"
 #include "packfile.h"
+#include "object-store.h"
 
 static const char * const prune_packed_usage[] = {
        N_("git prune-packed [-n | --dry-run] [-q | --quiet]"),