summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:26 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:26 -0700
commit9a33b691aaaae995b2da65a08d927c31106c8a3d (patch)
treed07a1efd88b32931baaf9f9d3940973cbb447bf1 /merge-recursive.c
parent17e2b114a8f9d66d7c9263755f89cc503c94c38c (diff)
parentf7d650c06ea3242cbf0e6ae2820d5b839ab97cd5 (diff)
downloadgit-9a33b691aaaae995b2da65a08d927c31106c8a3d.tar.gz
Merge branch 'cn/eradicate-working-copy'
* cn/eradicate-working-copy: Remove 'working copy' from the documentation and C code
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 3efc04e04f..c34a4f148b 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