diff modules/git-merge-changelog @ 9710:b2e9096015d9

Support the "git pull --rebase" situation.
author Bruno Haible <bruno@clisp.org>
date Sun, 17 Feb 2008 15:42:34 +0100
parents abc803d0356b
children a49ca512452c
line wrap: on
line diff
--- a/modules/git-merge-changelog
+++ b/modules/git-merge-changelog
@@ -18,6 +18,7 @@
 xmalloca
 fstrcmp
 minmax
+c-strstr
 fwriteerror
 
 configure.ac: