git-tag(1): -v option is a subcommand; fix code block

[git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 37f1ba93fe943e45a984c012b31390d68fc9498c..8f72b2c079a68ac5cb9d1c90bb7b72fa779efb5f 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1342,9 +1342,14 @@ static int process_renames(struct path_list *a_renames,
                                mfi = merge_file(o, a, b,
                                                a_branch, b_branch);
 
-                               if (mfi.merge && mfi.clean &&
+                               if (mfi.clean &&
                                    sha_eq(mfi.sha, ren1->pair->two->sha1) &&
                                    mfi.mode == ren1->pair->two->mode)
+                                       /*
+                                        * This messaged is part of
+                                        * t6022 test. If you change
+                                        * it update the test too.
+                                        */
                                        output(3, "Skipped %s (merged same as existing)", ren1_dst);
                                else {
                                        if (mfi.merge || !mfi.clean)