Skip to content

Instantly share code, notes, and snippets.

@maxim

maxim/conflicts.rb

Created February 26, 2011 01:57
Show Gist options
  • Save maxim/844847 to your computer and use it in GitHub Desktop.
Save maxim/844847 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
conflicts.rb
#!/usr/bin/env ruby
STDIN.read.split("\n").each{ |line| puts line if (line =~ /CONFLICT/) }
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment