Code

Merge branch 'cn/eradicate-working-copy'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:26 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:26 +0000 (12:36 -0700)
* cn/eradicate-working-copy:
  Remove 'working copy' from the documentation and C code

1  2 
Documentation/config.txt
diff-lib.c
merge-recursive.c

Simple merge
diff --cc diff-lib.c
Simple merge
Simple merge