Enable threaded delta search on *BSD and Linux.

diff --git a/rerere.c b/rerere.c
index eec2b501072a44f34093cc48acd2c2d5020f04b1..0456aa6376caa1387284aa8fe42fc1ff66629822 100644 (file)
--- 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;
                        }
                }
@@ -342,7 +345,7 @@ int setup_rerere(struct path_list *merge_rr)
        if (!is_rerere_enabled())
                return -1;
 
-       merge_rr_path = xstrdup(git_path("rr-cache/MERGE_RR"));
+       merge_rr_path = xstrdup(git_path("MERGE_RR"));
        fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1);
        read_rr(merge_rr);
        return fd;