gusaaaaa/vim_solve_conflicts.sh

Created February 19, 2014 15:06

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/gusaaaaa/9093900.js"></script>
Save gusaaaaa/9093900 to your computer and use it in GitHub Desktop.

Download ZIP

Opens a tab per each file in conflict

Raw

vim_solve_conflicts.sh

git status | grep 'both modified' | awk '{print $4}' | vim -p `tr '\n' ' '`

Author

gusaaaaa commented Feb 19, 2014

La posta. Thanks, @foca!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment