Don't set merge tool on Linux.

reitermarkus · May 16, 2024 · 0e7a0fb · 0e7a0fb
1 parent 29ea864
commit 0e7a0fb
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/tasks/git.rake b/lib/tasks/git.rake
@@ -68,11 +68,13 @@ namespace :git do
     command 'git', 'config', '--global', 'instaweb.httpd', 'webrick'
     command 'git', 'config', '--global', 'instaweb.browser', 'open'
 
-    command 'git', 'config', '--global', 'mergetool.araxis.path', 'araxiscompare'
-    command 'git', 'config', '--global', 'merge.tool', 'araxis'
+    unless linux?
+      command 'git', 'config', '--global', 'mergetool.araxis.path', 'araxiscompare'
+      command 'git', 'config', '--global', 'merge.tool', 'araxis'
 
-    command 'git', 'config', '--global', 'difftool.araxis.path', 'araxiscompare'
-    command 'git', 'config', '--global', 'diff.tool', 'araxis'
+      command 'git', 'config', '--global', 'difftool.araxis.path', 'araxiscompare'
+      command 'git', 'config', '--global', 'diff.tool', 'araxis'
+    end
   end
 
   desc 'Install Git Commands'