Jelajahi Sumber

feat: update mergetools to add mergiraf and remove sourcetree

Kyle P Davis 4 hari lalu
induk
melakukan
b1d3fee2ff
1 mengubah file dengan 3 tambahan dan 1 penghapusan
  1. 3 1
      gimmes/tools/mergetool

+ 3 - 1
gimmes/tools/mergetool

@@ -2,7 +2,9 @@
 set -o errexit -o pipefail
 set -o errexit -o pipefail
 
 
 if [[ "$OS" = "Darwin" ]]; then
 if [[ "$OS" = "Darwin" ]]; then
-	gimme sourcetree
+	gimme \
+        mergiraf \
+        --
 else
 else
 	gimme meld
 	gimme meld
 fi
 fi