From: Elijah Newren Date: Fri, 12 Aug 2011 05:19:50 GMT Subject: [PATCHv2 17/56] merge-recursive: Correct a comment Message-ID: <1313126429-17368-18-git-send-email-newren@gmail.com> In-Reply-To: <1313126429-17368-1-git-send-email-newren@gmail.com> Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- No changes since v1. merge-recursive.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 3fcd0a5..3d464d9 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1439,7 +1439,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 -> (directory, file) */ const char *add_branch; const char *other_branch; unsigned mode; -- 1.7.6.100.gac5c1