git-gui: Restore ability to Stage Working Copy for conflicts.