From 5a055a02f87dde1f124cc4abbba18ab80451dd60 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Thu, 16 Nov 2023 11:28:11 +0100 Subject: extra: add meld diff and merge tool --- extra.md | 3 +++ 1 file changed, 3 insertions(+) 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/ -- cgit v1.2.3