| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Oct 2011 19:36:26 +0000 (12:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Oct 2011 19:36:26 +0000 (12:36 -0700) | ||
| commit | 9a33b691aaaae995b2da65a08d927c31106c8a3d | |
| tree | d07a1efd88b32931baaf9f9d3940973cbb447bf1 | tree | snapshot |
| parent | 17e2b114a8f9d66d7c9263755f89cc503c94c38c | commit | diff |
| parent | f7d650c06ea3242cbf0e6ae2820d5b839ab97cd5 | commit | diff |
Merge branch 'cn/eradicate-working-copy'
* 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 |