Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Apr 2009 06:23:17 +0000 (23:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Apr 2009 06:23:17 +0000 (23:23 -0700)
* jc/maint-1.6.0-diff-borrow-carefully:
diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged

No differences found