From: Saba Saba <saba@sabadev.xyz>
Date: Thu, 9 Feb 2023 17:26:20 +0000 (-0500)
Subject: Implemented mergetool
X-Git-Url: http://sabadev.xyz:4321/?a=commitdiff_plain;h=0c72f34ca38a001c0686cacc0c2799cf4f5d5fbd;p=git-repl.git

Implemented mergetool
---

diff --git a/git-repl.cl b/git-repl.cl
index 8e381df..9cb1650 100644
--- a/git-repl.cl
+++ b/git-repl.cl
@@ -187,6 +187,10 @@
         (git "checkout" revision))
       (git "checkout" revision)))
 
+(defun-public mergetool ()
+  "Executes the mergetool configured with git"
+  (git "mergetool"))
+
 (defun-public help ()
   "Prints out usage instructions for this REPL"
   (write-line "This is a Common Lisp REPL.")