Merging

Dry run a merge

git merge --no-commit <branch>

The changes will be staged, so view them with

git diff --cached

To undo the merge

git merge --abort

Stack Overflow