Split "_repoDir" into Work and Git variants.
Throw real Errors, not Strings.
Write an isRebasing() method.
Unnecessary fat arrow. Thanks, coffeelint!
Tests and fixtures for rebase detection.
GitBridge.isRebase() now passes tests.
Track merge state in a persistent object.
We don't actually need the object DBs for these (yet).
Pass merge state into ConflictMarkers as well.
Use "this" instead of stand-alone @.
Grab the MergeState from each Conflict.
Derp derp `isEmpty()` is a function.
Specs for handling rebases.
Refactor the bejeezus out of Conflict.all.

When rebasing, flip "ours" and "theirs".
Add a Side's position to its CSS.
Style .top and .bottom.
Customize messages for rebasing.
Oops, those are class methods.
Merge pull request #44 from smashwilson/rebase-handling

Handle rebases and stashes properly