Merge branch 'da/mergetool-xxdiff-hotkey'

diff --git a/git-compat-util.h b/git-compat-util.h
index 49ca28cb6b5aa9e06e16c16febde03a7a5e66959..87237b092b51df6255552f0756359eddf3b12042 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1101,6 +1101,6 @@ struct tm *git_gmtime_r(const time_t *, struct tm *);
 #define getc_unlocked(fh) getc(fh)
 #endif
 
-#endif
-
 extern int cmd_main(int, const char **);
+
+#endif