![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Oct 2011 23:13:31 +0000 (16:13 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Oct 2011 23:13:31 +0000 (16:13 -0700) | ||
| commit | a5ad8d1bddecfcbe318e5e409e6e9e40c7c073d3 | |
| tree | ed77c22d84395d3c766686c6da92b014974b07e4 | tree | snapshot |
| parent | f0911b996cac9b89b9175676f74bbcb5a9a9e34f | commit | diff |
| parent | f7d650c06ea3242cbf0e6ae2820d5b839ab97cd5 | commit | diff |
Merge branch 'cn/eradicate-working-copy' into maint
* cn/eradicate-working-copy:
Remove 'working copy' from the documentation and C code
* cn/eradicate-working-copy:
Remove 'working copy' from the documentation and C code
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| diff-lib.c | diff1 | | diff2 | | blob | history |
| merge-recursive.c | diff1 | | diff2 | | blob | history |