diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:13:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:13:31 -0700 |
| commit | a5ad8d1bddecfcbe318e5e409e6e9e40c7c073d3 (patch) | |
| tree | ed77c22d84395d3c766686c6da92b014974b07e4 /merge-recursive.c | |
| parent | f0911b996cac9b89b9175676f74bbcb5a9a9e34f (diff) | |
| parent | f7d650c06ea3242cbf0e6ae2820d5b839ab97cd5 (diff) | |
| download | git-a5ad8d1bddecfcbe318e5e409e6e9e40c7c073d3.tar.gz | |
Merge branch 'cn/eradicate-working-copy' into maint
* cn/eradicate-working-copy:
Remove 'working copy' from the documentation and C code
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 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 |