textmate/textmate — pull request #1205 by gknops (2013-12-28 02:24:57+00:00)
Title: Show git conflicts with priority

Show git conflicts in upstream directories with higher priority than other changes.

Previously git conflicts did not show at all in upstream directories.