builtin/merge.c: fix a bug with trivial merges

diff --git a/config.mak.uname b/config.mak.uname
index d6f7980bb91ab7d1e4a02a91407bd8e38461671b..fe8096f8a65241760cfdc3dabd4cf63ee412e9ca 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -37,6 +37,7 @@ ifeq ($(uname_S),Linux)
        HAVE_CLOCK_GETTIME = YesPlease
        HAVE_CLOCK_MONOTONIC = YesPlease
        HAVE_GETDELIM = YesPlease
+       SANE_TEXT_GREP=-a
 endif
 ifeq ($(uname_S),GNU/kFreeBSD)
        HAVE_ALLOCA_H = YesPlease