?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 7aea7c1) | patch
apply-from-gmane: fall back to three-way merges
commita98fbeca14869277406b526dfa7ca0d6b576e025
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 12 Jun 2013 20:40:02 +0000 (12 15:40 -0500)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 12 Jun 2013 20:40:02 +0000 (12 15:40 -0500)
tree5a784b284d6125e15189df30413ca02df7eee388tree | snapshot (tar.gz zip)
parent7aea7c12a4991983572669fef6d973d854e1e6c8commit | diff
apply-from-gmane: fall back to three-way merges

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
bin/apply-from-gmane.sh diff | blob | blame | history
msysGit -- the development environment for 'Git for Windows'