apply-from-gmane: fall back to three-way merges
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 12 Jun 2013 20:40:02 +0000 (15:40 -0500)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 12 Jun 2013 20:40:02 +0000 (15:40 -0500)
commita98fbeca14869277406b526dfa7ca0d6b576e025
tree5a784b284d6125e15189df30413ca02df7eee388
parent7aea7c12a4991983572669fef6d973d854e1e6c8
apply-from-gmane: fall back to three-way merges

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
bin/apply-from-gmane.sh