To list the unmerged files — where you’ve got merge conflicts to resolve:

git diff --name-only --diff-filter=U

Filters are:

• Added (A)
• Copied (C)
• Deleted (D)
• Modified (M)
• Renamed (R)
• Type changed (T)
• Unmerged (U)
• Unknown (X)
• pairing Broken (B)

(use lower case letters to exclude)