merge-file: let conflict markers match end-of-line style of the context

diff --git a/git-compat-util.h b/git-compat-util.h
index 4fe10cc146b5493fad0b073c6410395cd6c7172f..0feeae298340afbe22276ce595de4a6cba397926 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -923,9 +923,6 @@ int access_or_die(const char *path, int mode, unsigned flag);
 /* Warn on an inaccessible file that ought to be accessible */
 void warn_on_inaccessible(const char *path);
 
-/* Get the passwd entry for the UID of the current process. */
-struct passwd *xgetpwuid_self(void);
-
 #ifdef GMTIME_UNRELIABLE_ERRORS
 struct tm *git_gmtime(const time_t *);
 struct tm *git_gmtime_r(const time_t *, struct tm *);