Permalink
Browse files

Make Git Resolve Conflicts works on Mountain Lion

Update Git Resolve Conflicts.tmCommand to work with Mountain Lion.
  • Loading branch information...
1 parent 926d8bb commit df7c6aeaecdacb900ae23d91bd08c4de31ee3305 @carlosbrando carlosbrando committed with infininight Sep 7, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 Commands/Git Resolve Conflicts.tmCommand
@@ -12,7 +12,7 @@
# http://code.leadmediapartners.com/
require "fileutils"
-FM="/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge"
+FM="/Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge"
require ENV['TM_BUNDLE_SUPPORT'] + '/environment.rb'
require ENV['TM_SUPPORT_PATH'] + '/lib/escape.rb'

0 comments on commit df7c6ae

Please sign in to comment.