Skip to content

Instantly share code, notes, and snippets.

@kzim44
Created August 27, 2013 06:04
Show Gist options
  • Save kzim44/6350110 to your computer and use it in GitHub Desktop.
Save kzim44/6350110 to your computer and use it in GitHub Desktop.
Git - commandline to list file names with conflicts
git diff --name-only --diff-filter=U
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment