sun/git-subtree — comment on commit 470016120fcc0bf819bf8b5a562d653ccecdc4b6
File:  line 0
By sun:

Err, sorry, that's wrong. It's a 3-way merge, not 2-way-attempting-to-overwrite-or-whatnot...

Shouldn't have completely changed branch names from my real example... ;)