builtin/merge.c: fix a bug with trivial merges

diff --git a/run-command.h b/run-command.h
index 65bd4242163a0f17d8a81afb8895fc7974a4a499..de1727efab9d7e57a41626ac8bd89e5149412dc8 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -121,6 +121,7 @@ struct async {
 int start_async(struct async *async);
 int finish_async(struct async *async);
 int in_async(void);
+void NORETURN async_exit(int code);
 
 /**
  * This callback should initialize the child process and preload the