Merge 71f1e4bc0d into 8f95637e67

plugins/araxis-merge/README.md

@@ -0,0 +1,11 @@
+## araxis-merge
+
+Plugin for Araxis Merge, an advanced 2 and 3-way file comparison (diff), merging and folder synchronization tool.
+
+### Requirements
+
+ * [Araxis Merge](http://www.araxis.com/merge/)
+
+### Usage
+
+ * When this plugin is enabled the Araxis Merge utilities are added to `PATH`

plugins/araxis-merge/araxis-merge.plugin.zsh

@@ -0,0 +1,16 @@
+# Araxis Merge Utilities
+
+if  [[ "$OSTYPE" = darwin* ]]; then
+    local _araxis_merge_darwin_paths > /dev/null 2>&1
+    _araxis_merge_darwin_paths=(
+        "$HOME/Applications/Araxis Merge.app/Contents/Utilities"
+        "/Applications/Araxis Merge.app/Contents/Utilities"
+    )
+
+    for _araxis_merge_path in $_araxis_merge_darwin_paths; do
+        if [[ -d "$_araxis_merge_path" ]]; then
+            export PATH="${_araxis_merge_path}":$PATH
+            break
+        fi
+    done
+fi