mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cn/eradicate-working-copy'

Browse Source 
* cn/eradicate-working-copy:
  Remove 'working copy' from the documentation and C code
This commit is contained in:
Junio C Hamano
2011-10-05 12:36:26 -07:00
parent 17e2b114a8 f7d650c06e
commit 9a33b691aa
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -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