From: Elijah Newren <newren@gmail.com>
Date: Fri, 12 Aug 2011 05:19:50 +0000 (-0600)
Subject: merge-recursive: Correct a comment
X-Git-Tag: v1.7.7-rc1~28^2~40
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=abafc88e76dc731e340b8ec0674b38b05d43b4f7;p=git.git

merge-recursive: Correct a comment

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index d6f238dab..a7ba9b0aa 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -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;