wrapper: implement xopen()

diff --git a/advice.h b/advice.h
index 5ecc6c154e5a7207d18bbb05da5e35b2b4eae230..b341a55ce7c250cc34b49dc06a2843b5a5df1aac 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -24,6 +24,7 @@ __attribute__((format (printf, 1, 2)))
 void advise(const char *advice, ...);
 int error_resolve_conflict(const char *me);
 extern void NORETURN die_resolve_conflict(const char *me);
+void NORETURN die_conclude_merge(void);
 void detach_advice(const char *new_name);
 
 #endif /* ADVICE_H */