  			      rerere_path(id, "postimage"));
  
 diff -ru source/run-command.c source-new/run-command.c
---- source/run-command.c	2017-06-04 18:08:11.000000000 -0700
-+++ source-new/run-command.c	2017-08-15 13:29:42.359635956 -0700
+--- source/run-command.c	2017-06-04 19:08:11.000000000 -0600
++++ source-new/run-command.c	2018-12-02 14:18:59.804197591 -0700
 @@ -138,7 +138,7 @@
  		return NULL;
  

 
 static int display(struct progress *progress, unsigned n, const char *done)
diff -ru source/rerere.c source-new/rerere.c
--- source/rerere.c	2017-06-04 18:08:11.000000000 -0700
+++ source-new/rerere.c	2017-08-15 13:29:42.356302602 -0700
@@ -682,7 +682,7 @@
 	 * A successful replay of recorded resolution.
 	 * Mark that "postimage" was used to help gc.

+
 #endif
diff -ru source/Makefile source-new/Makefile
--- source/Makefile	2017-06-04 19:08:11.000000000 -0600
+++ source-new/Makefile	2018-12-02 14:18:59.804197591 -0700
@@ -1802,7 +1802,6 @@
 
 $(BUILT_INS): git$X
