Use meld for git merges.

2024-01-10 22:20:30 -05:00
parent 6fc16362ba
commit 3706eda8f3
3 changed files with 31 additions and 0 deletions
--- a/ansible/roles/base/tasks/common.yaml
+++ b/ansible/roles/base/tasks/common.yaml
@@ -17,6 +17,7 @@
      - colordiff
      - ipcalc
      - kdiff3
+      - meld
      - tcpdump
      - moreutils # for ts [%Y-%m-%d %H:%M:%.S]
      - ddrescue