xdiff-merge: optionally show conflicts in "diff3 -m" style

diff --git a/Makefile b/Makefile
index 53ab4b55369652ecbcbd7b2655a9dfc6aeb08336..2cef0187d1d28ef2b466c1231499409f5cc1532f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -727,6 +727,7 @@ ifeq ($(uname_S),HP-UX)
        NO_UNSETENV = YesPlease
        NO_HSTRERROR = YesPlease
        NO_SYS_SELECT_H = YesPlease
+       SNPRINTF_RETURNS_BOGUS = YesPlease
 endif
 ifneq (,$(findstring MINGW,$(uname_S)))
        NO_MMAP = YesPlease