merge: use editor by default in interactive sessions

diff --git a/git-compat-util.h b/git-compat-util.h
index 041cbdb93e637f94711155230ed8d08749d7523d..5ef8ff76f6fd262c3109d25d706ebd3db35c73fa 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -215,10 +215,14 @@ extern char *gitbasename(char *);
 #define is_dir_sep(c) ((c) == '/')
 #endif
 
+#ifndef find_last_dir_sep
+#define find_last_dir_sep(path) strrchr(path, '/')
+#endif
+
 #if __HP_cc >= 61000
 #define NORETURN __attribute__((noreturn))
 #define NORETURN_PTR
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && !defined(NO_NORETURN)
 #define NORETURN __attribute__((__noreturn__))
 #define NORETURN_PTR __attribute__((__noreturn__))
 #elif defined(_MSC_VER)