Adding git unpushed command and setting git merge conflict to diff3