v4orb2.wiki

commit 236e24d77694e4fe5b4953208a5e73d3041d1fff
parent 3a364e57bf6eb1f4c8cb093e1980123f45310823
Author: E.A.Bekhtenev <E.A.Bekhtenev@inp.nsk.su>
Date:   Mon,  5 Sep 2022 12:01:13 +0700

use meld as *tool

Diffstat:
M
git.md
 | 
19
+++++++++++++++++++

1 file changed, 19 insertions(+), 0 deletions(-)
diff --git a/git.md b/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"
+```