summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2011-08-12 05:19:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-14 21:19:34 (GMT)
commitabafc88e76dc731e340b8ec0674b38b05d43b4f7 (patch)
tree1922c917a2ac3943a5dc0c5de33b0dbf5879cc00
parentc43ba42e8d3b3b85e322c36d35053f650835ce0a (diff)
downloadgit-abafc88e76dc731e340b8ec0674b38b05d43b4f7.zip
git-abafc88e76dc731e340b8ec0674b38b05d43b4f7.tar.gz
git-abafc88e76dc731e340b8ec0674b38b05d43b4f7.tar.bz2
merge-recursive: Correct a comment
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index d6f238d..a7ba9b0 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;