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)
* 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