Commits

Anonymous committed d1f2e16 Merge

Merge branch 'jc/rerere-auto-more'

* jc/rerere-auto-more:
rerere.autoupdate: change the message when autoupdate is in effect

  • Participants
  • Parent commits 245648d, 9196e82

Comments (0)

Files changed (1)

 
 		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;
 			}
 		}