fastcommit
git diff conflict alias for showing conflicted files