Git: aliases for showing merge states of a file