📜  git diff - Shell-Bash 代码示例

📅  最后修改于: 2022-03-11 14:50:46.461000             🧑  作者: Mango

代码示例5
## View all the merge conflicts:
git diff

## View the conflicts against the base file:
git diff --base 

## Preview changes, before merging:
git diff