Skip to content

Instantly share code, notes, and snippets.

@mthelander

mthelander/gitmergeopen

Created October 1, 2013 18:15
Show Gist options
  • Save mthelander/6782684 to your computer and use it in GitHub Desktop.
Save mthelander/6782684 to your computer and use it in GitHub Desktop.
Download ZIP
Open in $EDITOR all files with merge conflicts
Raw
gitmergeopen
function gitmergeopen() {
eval "$EDITOR \$(git diff --name-status --diff-filter=U | sed -re 's/^.+\s//')"
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment