Merge branch 'jc/rerere-auto-more'

gitster · gitster · commit d1f2e1696ce1 · 2008-07-20T18:00:17.000-07:00
* jc/rerere-auto-more:
  rerere.autoupdate: change the message when autoupdate is in effect
diff --git a/rerere.c b/rerere.c
@@ -278,10 +278,13 @@ static int do_plain_rerere(struct path_list *rr, int fd)
 
 		if (has_resolution(name)) {
 			if (!merge(name, path)) {
-				fprintf(stderr, "Resolved '%s' using "
-						"previous resolution.\n", path);
 				if (rerere_autoupdate)
 					path_list_insert(path, &update);
+				fprintf(stderr,
+					"%s '%s' using previous resolution.\n",
+					rerere_autoupdate
+					? "Staged" : "Resolved",
+					path);
 				goto mark_resolved;
 			}
 		}
