From: Elijah Newren Date: Mon, 21 Mar 2011 18:30:58 GMT Subject: [WIP PATCH 04/10] Correct a comment Message-ID: <1300732264-9638-5-git-send-email-newren@gmail.com> In-Reply-To: <1300732264-9638-1-git-send-email-newren@gmail.com> --- merge-recursive.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index fde9f9e..1da385c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1464,7 +1464,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.4