...
[15:57:40 CDT(-0500)] <athena> ooo
[16:12:13 CDT(-0500)] <EricDalquist> every time I have to do something like that
[16:12:15 CDT(-0500)] <EricDalquist> git amazes me
[16:12:21 CDT(-0500)] <EricDalquist> it handles merging across branches so nicely