Show a failure of rebase -p if the merge had a conflict

diff --git a/config.mak.in b/config.mak.in
index ea7705c1edb6040a900159077a60e129e03a5de1..14dfb21fa59efb7482ea0727845c8198cc996271 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -51,4 +51,5 @@ OLD_ICONV=@OLD_ICONV@
 NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@
 FREAD_READS_DIRECTORIES=@FREAD_READS_DIRECTORIES@
 SNPRINTF_RETURNS_BOGUS=@SNPRINTF_RETURNS_BOGUS@
+NO_PTHREADS=@NO_PTHREADS@
 PTHREAD_LIBS=@PTHREAD_LIBS@