How to check if a merge commit contains manual changes (e.g. resolved conflicts)?

How can I find out if there were conflicts when merging a branch and what shenanigans did the person have to do to resolve those conflicts?

git log -p seems to show empty diffs for all merge commits, regardless whether they have manual changes or not.

  • Is there a way to change the file path for an Rstudio project?
  • How do I migrate a SVN repository with many projects and common libraries to Git/Gitlab?
  • Https certificate errors for GitHub using git on Windows 7
  • Why is indentation in empty lines bad?
  • How can I discard modified files?
  • Ruby on rails Xero integration with Xeroizer
  • Difftool for binary files in git
  • Can I share my private GitHub repository by link?
  • GIT: Should I commit output files (like *.exe, *.lib) when project in a stable revision?
  • Git - master working copy the same as clone working copy
  • Git: Stage into Commit, what is the right workflow?
  • String comparison not working in PowerShell function - what am I doing wrong?
  • One Solution collect form web for “How to check if a merge commit contains manual changes (e.g. resolved conflicts)?”

    git show produces a combined diff for a merge commit by default, which will contain only the lines that changed as part of the conflict resolution.

    git show <merge_commit_sha1>
    

    git log takes the --cc option to produce combined diffs for merge commits. For example, to find all merge commits with manual changes you can use:

    git log -p --cc --min-parents=2
    

    and look for commits with diffs.

    Git Baby is a git and github fan, let's start git clone.