Please bring back "Disable Lightning" option

[neobrain]

(12-20-2012, 01:22 AM)cluthz Wrote: I didn't change anything in the the local clone.

You probably ran the "git revert" command twice, and the first one locally modified your working copy

(12-20-2012, 01:22 AM) cluthz Wrote: dolphin-emu tob$ git revert 1dd6b978c1da
error: could not revert 1dd6b97... Remove "Disable Lighting".
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

post the output of "git status"