Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Don’t hardcode path to FileMerge.app

  • Loading branch information...
commit b655e8789f94ff0c11397acdc61dd871ca44d05f 1 parent 1188d83
@sorbits sorbits authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  Commands/Git Resolve Conflicts.tmCommand
View
2  Commands/Git Resolve Conflicts.tmCommand
@@ -12,7 +12,7 @@
# http://code.leadmediapartners.com/
require "fileutils"
-FM="/Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge"
+FM="#{`"$TM_SUPPORT_PATH/bin/find_app" FileMerge.app`}/Contents/MacOS/FileMerge"
require ENV['TM_BUNDLE_SUPPORT'] + '/environment.rb'
require ENV['TM_SUPPORT_PATH'] + '/lib/escape.rb'
Please sign in to comment.
Something went wrong with that request. Please try again.