mirror of
https://github.com/genesi/linux-legacy.git
synced 2026-11-17 01:21:37 +00:00
git did actually warn me about the fact that I hadn't actually done an "update-cache" on these two files, but the warning was at the bottom of a list of all the files that _did_ change in the merge, so I never noticed. My bad.