merge-recursive: Correct a comment
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 11, 2011 at 23:19 UTC
abafc88e76dc731e340b8ec0674b38b05d43b4f7
1 file changed
+1
-1
merge-recursive.c
+1
-1
@@ -1437,7 +1437,7 @@ static int process_df_entry(struct merge_options *o,
1437
handle_delete_modify(o, path, new_path,
1438
a_sha, a_mode, b_sha, b_mode);
1439
} else if (!o_sha && !!a_sha != !!b_sha) {
1440
- /* directory -> (directory, file) */
1440
+ /* directory -> (directory, file) or <nothing> -> (directory, file) */
1441
const char *add_branch;
1442
const char *other_branch;
1443
unsigned mode;