📅  最后修改于: 2022-03-11 14:50:46.461000             🧑  作者: Mango
## View all the merge conflicts:
git diff
## View the conflicts against the base file:
git diff --base
## Preview changes, before merging:
git diff