Merge branch 'cn/eradicate-working-copy' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:13:31 +0000 (16:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:13:31 +0000 (16:13 -0700)
commita5ad8d1bddecfcbe318e5e409e6e9e40c7c073d3
treeed77c22d84395d3c766686c6da92b014974b07e4
parentf0911b996cac9b89b9175676f74bbcb5a9a9e34f
parentf7d650c06ea3242cbf0e6ae2820d5b839ab97cd5
Merge branch 'cn/eradicate-working-copy' into maint

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