Merge branch 'jc/rerere-auto-more'

* jc/rerere-auto-more: rerere.autoupdate: change the message when autoupdate is in effect
git-mirror · Jul 21, 2008 · d1f2e16 · d1f2e16
2 parents 245648d + 9196e82
commit d1f2e16
Showing 1 changed file with 5 additions and 2 deletions.
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;
 			}
 		}