git-gui: Include commit id/subject in merge choices