[PATCH] git-merge-one-file-script cleanups from Cogito

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index ab77b4b..046d9a3 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -786,8 +786,8 @@ static void diff_flush_patch(struct diff_filepair *p)
        case 'R':
                sprintf(msg_,
                        "similarity index %d%%\n"
-                       "rename old %s\n"
-                       "rename new %s",
+                       "rename from %s\n"
+                       "rename to %s",
                        (int)(0.5 + p->score * 100.0/MAX_SCORE),
                        p->one->path, p->two->path);
                msg = msg_;
@@ -964,11 +964,11 @@ void diffcore_std(const char **paths,
 {
        if (paths && paths[0])
                diffcore_pathspec(paths);
-       if (0 <= break_opt)
+       if (break_opt != -1)
                diffcore_break(break_opt);
        if (detect_rename)
                diffcore_rename(detect_rename, rename_score);
-       if (0 <= break_opt)
+       if (break_opt != -1)
                diffcore_merge_broken();
        if (pickaxe)
                diffcore_pickaxe(pickaxe, pickaxe_opts);