git.md

@@ -22,3 +22,22 @@ CSS:     table.css
  git config --global alias.st "status --short --branch"
 ```
 
+# meld как difftool и mergetool
+
+https://reangdblog.blogspot.com/2015/11/git-meld-5.html?ysclid=l7oakrn61400598641
+
+```
+[alias]
+    df = difftool --dir-diff
+    mt = mergetool -t meld
+[diff]
+    tool = meld
+[difftool "meld"]
+    cmd = meld $LOCAL $REMOTE
+[merge]
+    tool = meld
+[mergetool "meld"]
+    prompt = false
+    keepBackup = true
+    cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output="$MERGED"
+```