merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/base85.c b/base85.c
index e459feebbf90c6557dbf3ff913f83a57a8afb210..5ca601ee14fd2ab3b78577aa22a5db778bc7fbe0 100644 (file)
--- a/base85.c
+++ b/base85.c
@@ -7,9 +7,9 @@
 #define say1(a,b) fprintf(stderr, a, b)
 #define say2(a,b,c) fprintf(stderr, a, b, c)
 #else
-#define say(a) do {} while(0)
-#define say1(a,b) do {} while(0)
-#define say2(a,b,c) do {} while(0)
+#define say(a) do { /* nothing */ } while (0)
+#define say1(a,b) do { /* nothing */ } while (0)
+#define say2(a,b,c) do { /* nothing */ } while (0)
 #endif
 
 static const char en85[] = {
@@ -41,7 +41,7 @@ int decode_85(char *dst, const char *buffer, int len)
 {
        prep_base85();
 
-       say2("decode 85 <%.*s>", len/4*5, buffer);
+       say2("decode 85 <%.*s>", len / 4 * 5, buffer);
        while (len) {
                unsigned acc = 0;
                int de, cnt = 4;