From aca64811f500bead4efe9080f77bb4f5ef2cc71c Mon Sep 17 00:00:00 2001
From: "chawley (chawley-admin)" <chawley@overdrive.com>
Date: Wed, 11 Mar 2020 12:55:15 -0400
Subject: [PATCH] Added a git testmerge hack function to .zsh_functions

---
 .zsh_functions | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.zsh_functions b/.zsh_functions
index 443e316..c45b4b7 100644
--- a/.zsh_functions
+++ b/.zsh_functions
@@ -93,3 +93,12 @@ fi
 f() {
       find . -iname "*${1}*"
   }
+
+# git testmerge
+testmerge() {
+    echo "git merge --no-commit --no-ff $1"
+    git merge --no-commit --no-ff $1
+    echo "git diff --cached"
+    git diff --cached
+    echo "'git merge --abort' when done"
+}