git-gui: Support conflict states _U & UT.