fix ggsh with merge commits

aspiers · Oct 26, 2014 · e47b22f · e47b22f
1 parent 0264618
commit e47b22f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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)