X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=c34a4f148b65cf81f28e2aed6c35e141e175b324;hb=0814d6e554c45636f41856cc2204abe2f661560c;hp=3efc04e04fd754de85fbab1dbafa7bffb2fa2854;hpb=df6840855d24c2f54c0b8a66cbac33d8af43333a;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 3efc04e04..c34a4f148 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -390,7 +390,7 @@ static void record_df_conflict_files(struct merge_options *o,
 				     struct string_list *entries)
 {
 	/* If there is a D/F conflict and the file for such a conflict
-	 * currently exist in the working copy, we want to allow it to be
+	 * currently exist in the working tree, we want to allow it to be
 	 * removed to make room for the corresponding directory if needed.
 	 * The files underneath the directories of such D/F conflicts will
 	 * be processed before the corresponding file involved in the D/F