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