Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint
* 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
Junio C Hamano committed
Apr 8, 2009 at 23:23 UTC
197cf8d59c0109f486ed6b56512b3c54ea44dccd
No changes.