From: Junio C Hamano Date: Thu, 29 Oct 2015 20:59:17 +0000 (-0700) Subject: Merge branch 'tk/sigchain-unnecessary-post-tempfile' X-Git-Tag: v2.7.0-rc0~67 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/433cc7e3fb861d4530ca6c49b152e94219bddfda Merge branch 'tk/sigchain-unnecessary-post-tempfile' Remove no-longer used #include. * tk/sigchain-unnecessary-post-tempfile: shallow: remove unused #include "sigchain.h" read-cache: remove unused #include "sigchain.h" diff: remove unused #include "sigchain.h" credential-cache--daemon: remove unused #include "sigchain.h" --- 433cc7e3fb861d4530ca6c49b152e94219bddfda diff --cc diff.c index 835a12e84d,75ad32ae79..80eb0c2156 --- a/diff.c +++ b/diff.c @@@ -13,8 -13,6 +13,7 @@@ #include "run-command.h" #include "utf8.h" #include "userdiff.h" - #include "sigchain.h" +#include "submodule-config.h" #include "submodule.h" #include "ll-merge.h" #include "string-list.h"