Merge branch 'cn/eradicate-working-copy'
commit9a33b691aaaae995b2da65a08d927c31106c8a3d
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:26 +0000 (5 12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:26 +0000 (5 12:36 -0700)
treed07a1efd88b32931baaf9f9d3940973cbb447bf1
parent17e2b114a8f9d66d7c9263755f89cc503c94c38c
parentf7d650c06ea3242cbf0e6ae2820d5b839ab97cd5
Merge branch 'cn/eradicate-working-copy'

* cn/eradicate-working-copy:
  Remove 'working copy' from the documentation and C code
Documentation/config.txt
diff-lib.c
merge-recursive.c