This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/usr/bin/ruby | |
all = `git ls-files -u`.split("\n") | |
unless all.empty? | |
file_names = all.collect do |info| | |
info.split("\t").last | |
end | |
%x[mate #{file_names.uniq.join(" ")}] | |
else | |
puts "open conflicted files - no files found." | |
end |
NewerOlder