| commit | e1f008ec81a2828dfb2113ce97347946f42e9f3e | [log] [tgz] |
|---|---|---|
| author | Garrett Cooper <yanegomi@gmail.com> | Tue Dec 14 00:21:59 2010 -0800 |
| committer | Garrett Cooper <yanegomi@gmail.com> | Tue Dec 14 00:21:59 2010 -0800 |
| tree | 16c2d116e5017837d9d987587e40acef0cbabdc1 | |
| parent | ff6484647a1c85a387599599fe87d435afbf2592 [diff] |
Fix compile. Apparently git doesn't stash local changes, so when one's doing git checkout <branch>, then has to pull / do a merge, the local changes are still active, and because there is a non-empty message in a merge, you end up screwing yourself over because the merge is then committed for you by git. THANKS LINUS... YOU CAN GO SUCK EGGS. Signed-off-by: Garrett Cooper <yanegomi@gmail.com>