diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:50 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:34 -0700 |
| commit | abafc88e76dc731e340b8ec0674b38b05d43b4f7 (patch) | |
| tree | 1922c917a2ac3943a5dc0c5de33b0dbf5879cc00 /merge-recursive.c | |
| parent | c43ba42e8d3b3b85e322c36d35053f650835ce0a (diff) | |
| download | git-abafc88e76dc731e340b8ec0674b38b05d43b4f7.tar.gz | |
merge-recursive: Correct a comment
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index d6f238dab0..a7ba9b0aa4 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; |