[PATCH] Make "git resolve" less scary