rerere: recalculate conflict ID when unresolved conflict is committed

diff --git a/config.mak.uname b/config.mak.uname
index a6e734c5d4ae7a3fc733e24bbfeae15ce6130ac4..684fc5bf02677bbaddd214f78b14fa55df7025c2 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -37,6 +37,7 @@ ifeq ($(uname_S),Linux)
        HAVE_GETDELIM = YesPlease
        SANE_TEXT_GREP=-a
        FREAD_READS_DIRECTORIES = UnfortunatelyYes
+       BASIC_CFLAGS += -DHAVE_SYSINFO
        PROCFS_EXECUTABLE_PATH = /proc/self/exe
 endif
 ifeq ($(uname_S),GNU/kFreeBSD)