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"
+}