1. 2008-09-17 [PATCH/RFC 1/2] Revert "git-gui: Don't allow staging files with conflict git Johannes Sixt