summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEkaitz Zarraga <ekaitz@elenq.tech>2023-11-16 11:28:11 +0100
committerEkaitz Zarraga <ekaitz@elenq.tech>2023-11-16 11:29:56 +0100
commit5a055a02f87dde1f124cc4abbba18ab80451dd60 (patch)
treed72e4f1c514529398aa44b13e08b8e2108892515
parent8e301cadf2789b31acbdb752279842ca2caba2d5 (diff)
extra: add meld diff and merge tool
-rw-r--r--extra.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/extra.md b/extra.md
index e8bf6d8..9cd3a6a 100644
--- a/extra.md
+++ b/extra.md
@@ -72,3 +72,6 @@ Rebasing, what can go wrong
https://jvns.ca/blog/2023/11/06/rebasing-what-can-go-wrong-/
How cherry pick and revert work
https://jvns.ca/blog/2023/11/10/how-cherry-pick-and-revert-work/
+
+Meld diff and merge tool
+https://meldmerge.org/