Add Sublime Merge

config.json

@@ -1,3 +1,4 @@
 {
-    "sublime_text": "C:/dev/apps/Sublime Text/Data"
+    "sublime_text": "C:/dev/apps/Sublime Text/Data",
+    "sublime_merge": "C:/dev/apps/Sublime Merge/Data"
 }

install.py

@@ -1,9 +1,15 @@
-import update, shutil, json
+import update, shutil, json, os
 
 if __name__ == "__main__":
     config = json.loads(update.read_file("config.json"))
-    away_subl_user = config["sublime_text"] + "/Packages/User"
-    here_subl_user = "sublime_text"
 
-    for here in os.listdir(here_subl_user):
-        shutil.copyfile(here_subl_user + "/" + here, away_subl_user + "/" + here)
+    if 1:
+        away_subl_user = config["sublime_text"] + "/Packages/User"
+        here_subl_user = "sublime_text"
+        for here in os.listdir(here_subl_user):
+            shutil.copyfile(here_subl_user + "/" + here, away_subl_user + "/" + here)
+    if 1:
+        away_smerge_user = config["sublime_merge"] + "/Packages/User"
+        here_smerge_user = "sublime_merge"
+        for here in os.listdir(here_smerge_user):
+            shutil.copyfile(here_smerge_user + "/" + here, away_smerge_user + "/" + here)

sublime_merge/Preferences.sublime-settings

@@ -0,0 +1,6 @@
+{
+	"theme": "Merge Dark.sublime-theme",
+	"side_bar_layout": "tabs",
+	"diff_algorithm": "match_git",
+	"visible_carriage_returns_at_eol": true,
+}

update.py

@@ -13,26 +13,36 @@ def write_file(path, content):
 
 if __name__ == "__main__":
     config = json.loads(read_file("config.json"))
-    away_subl_user = config["sublime_text"] + "/Packages/User"
-    here_subl_user = "sublime_text"
 
-    ok_patterns = [".sublime-build", "Preferences.sublime-settings", ".py", ".sublime-snippet", ".sublime-keymap"]
-    if not os.path.isdir(here_subl_user):
-        os.mkdir(here_subl_user)
-    for it in os.listdir(away_subl_user):
-        ok = False
-        for it_patt in ok_patterns:
-            if it.endswith(it_patt):
-                ok = True
-        if ok:
-            away_file = away_subl_user + "/" + it
-            here_file = here_subl_user + "/" + it
-            shutil.copyfile(away_file, here_file)
+    if 1:
+        away_subl_user = config["sublime_text"] + "/Packages/User"
+        here_subl_user = "sublime_text"
+        ok_patterns = [".sublime-build", "Preferences.sublime-settings", ".py", ".sublime-snippet", ".sublime-keymap"]
+        if not os.path.isdir(here_subl_user):
+            os.mkdir(here_subl_user)
+        for it in os.listdir(away_subl_user):
+            ok = False
+            for it_patt in ok_patterns:
+                if it.endswith(it_patt):
+                    ok = True
+            if ok:
+                away_file = away_subl_user + "/" + it
+                here_file = here_subl_user + "/" + it
+                shutil.copyfile(away_file, here_file)
+
+        installed_packages = ""
+        for it in os.listdir(config["sublime_text"] + "/Installed Packages"):
+            idx = it.find(".sublime-package")
+            installed_packages += it[:idx] + " :: Package Control\n"
+        installed_packages += "Sublime_RemedyBG :: https://github.com/krzosa/Sublime_RemedyBG\n"
+        write_file(here_subl_user + "/installed_packages.txt", installed_packages)
+
+    if 1:
+        away_smerge_user = config["sublime_merge"] + "/Packages/User"
+        here_smerge_user = "sublime_merge"
+        if not os.path.isdir(here_smerge_user):
+            os.mkdir(here_smerge_user)
+        for it in os.listdir(away_smerge_user):
+            shutil.copyfile(away_smerge_user + "/" + it, here_smerge_user + "/" + it)
 
-    installed_packages = ""
-    for it in os.listdir(config["sublime_text"] + "/Installed Packages"):
-        idx = it.find(".sublime-package")
-        installed_packages += it[:idx] + " :: Package Control\n"
-    installed_packages += "Sublime_RemedyBG :: https://github.com/krzosa/Sublime_RemedyBG\n"
-    write_file(here_subl_user + "/installed_packages.txt", installed_packages)