diff --git a/.shared_rc.d/git-pager b/.shared_rc.d/git-pager
index 110a40b..4994daa 100755
--- a/.shared_rc.d/git-pager
+++ b/.shared_rc.d/git-pager
@@ -14,7 +14,8 @@ case "$GIT_PAGER_MODE" in
         git_diff_highlight=y
         ;;
     diff)
-        git_pager_regexp='^diff .*'
+        # ggsh could be showing a merge commit
+        git_pager_regexp='^(diff|commit) .*'
         git_diff_highlight=y
         ;;
     commit)