Git Diff Ignore Merge Commits