Merge branch 'cn/eradicate-working-copy' into maint

* cn/eradicate-working-copy:
Remove 'working copy' from the documentation and C code

diff --cc Documentation/config.txt
Simple merge

diff --cc diff-lib.c
Simple merge

diff --cc merge-recursive.c
Simple merge