Code

merge-recursive: Correct a comment
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:50 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:34 +0000 (14:19 -0700)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c

index d6f238dab08a0bb56067d2eb409a9b46980eee04..a7ba9b0aa438958d7e0cbb301c7083cf5e8acc29 100644 (file)
@@ -1437,7 +1437,7 @@ static int process_df_entry(struct merge_options *o,
                handle_delete_modify(o, path, new_path,
                                     a_sha, a_mode, b_sha, b_mode);
        } else if (!o_sha && !!a_sha != !!b_sha) {
-               /* directory -> (directory, file) */
+               /* directory -> (directory, file) or <nothing> -> (directory, file) */
                const char *add_branch;
                const char *other_branch;
                unsigned mode;