commit | 9a645d6e9bfc58fd93e4c706e8ee7103a3067942 | [log] [tgz] |
---|---|---|
author | Ali Saidi <Ali.Saidi@ARM.com> | Mon Jan 07 13:05:32 2013 -0500 |
committer | Ali Saidi <Ali.Saidi@ARM.com> | Mon Jan 07 13:05:32 2013 -0500 |
tree | 2bc94678fe73294e531493605b8fab4f74de10e8 | |
parent | 5ebe3210d80d7f0226c33877d7200be8cb38d423 [diff] |
cache: add note about where conflicts are handled