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.

  • E: Unable to locate package git - Ubuntu on EC2
  • Can git permanently ignore a remote branch?
  • How to tell Git that it's the same directory, just a different name
  • git: setting a single tracking remote from a public repo
  • Visual Studio (Git provider) permanently shows “pending edit” on all files
  • Git check if there is outstanding commits to push
  • How to enforce Coding Standard for the repository located in GIthub
  • Git, how to automatize history collapse with rebase
  • SSIS solution on GIT?
  • git: merging feature branches into earlier part of master line
  • eclipse 3.5 filter .git folder
  • How can I undo a `git commit` locally and on a remote after `git push`
  • 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.