Show git conflicts with priority
Note that capnp is now brew installable
Fix file browser height for tabs above document

This fixes regression caused by 1de5d90475788143655a60fdbff654139fec3cb4 that
divider height and default compression priority disallowed expected height.
Build instructions: Assume people are using Xcode 5
Checkin release notes
Do not report “Failed: Extracting Archive” on download failure
Fix swapped freehanded left/right constants

In practice move() isn’t called with a freehanded left/right constant so the incorrect placement wasn’t causing an issue.
Add a Bitdeli badge to README
Saved with Xcode 5.0.2 (5A3005)
Preference to auto-reveal the current file in the project browser

An option called "Auto-reveal open file in project browser" has been
added to the Projects preference pane. When checked, the currently open
file will be revealed in the project's file browser. By default, the
option is not checked and thus the behavior is as it was before.
Add setting to disable tab re-ordering

When opening a document it will be placed to the right of the current one (in the tab bar) even if the document being opened is already in the tab bar, this is to make ⌘W work to “close and go back” without having to keep a list of previously selected tabs.

This feature can now be disabled using:

    defaults write com.macromates.TextMate.preview disableTabReordering -bool YES

Note though that if one selects multiple documents to open then it will potentially re-order the tab bar so that the documents selected are adjacent.
Merge branch 'master' of https://github.com/textmate/textmate into testBranch