sjs/bin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

this ain't pretty but it works

Browse source
This commit is contained in:
Sami Samhuri 2015-07-23 23:28:09 -07:00
parent ed1fe9602f
commit 4caf7b8bdb
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
git-edit-conflicted-files Executable file
View file

@ -0,0 +1,4 @@
#!/bin/sh
EDIT="${1:-${VISUAL:-$EDITOR}}"
eval $EDIT $(git conflicts | ruby -e "puts ARGF.each_line.to_a.map{|l| \"'\"+l.strip+\"'\"}.join(' ')")