diff options
| author | Carlos Martín Nieto <cmn@elego.de> | 2011-09-20 20:25:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-21 21:26:38 (GMT) |
| commit | f7d650c06ea3242cbf0e6ae2820d5b839ab97cd5 (patch) | |
| tree | 33c307f4cb61a5145738d0792150f67d97cf5ebf /merge-recursive.c | |
| parent | 167a5800cb707ed489c3cb88174ee21e95a610ae (diff) | |
| download | git-f7d650c06ea3242cbf0e6ae2820d5b839ab97cd5.zip git-f7d650c06ea3242cbf0e6ae2820d5b839ab97cd5.tar.gz git-f7d650c06ea3242cbf0e6ae2820d5b839ab97cd5.tar.bz2 | |
Remove 'working copy' from the documentation and C code
The git term is 'working tree', so replace the most public references
to 'working copy'.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
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 6bbc451..8148a4f 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 |