contrib/completion: add smerge to the mergetool completion candidates

diff --git a/trace2.h b/trace2.h
index fce9891f534e04cf0067787f5a035f9775e98ecd..ae5020d0e66e08d86e0eb1398bce884c29de4487 100644 (file)
--- a/trace2.h
+++ b/trace2.h
@@ -368,4 +368,18 @@ void trace2_printf(const char *fmt, ...);
 /* clang-format on */
 #endif
 
+/*
+ * Optional platform-specific code to dump information about the
+ * current and any parent process(es).  This is intended to allow
+ * post-processors to know who spawned this git instance and anything
+ * else the platform may be able to tell us about the current process.
+ */
+#if defined(GIT_WINDOWS_NATIVE)
+void trace2_collect_process_info(void);
+#else
+#define trace2_collect_process_info() \
+       do {                          \
+       } while (0)
+#endif
+
 #endif /* TRACE2_H */