merge-recursive: switch from (oid,mode) pairs to a diff_filespec

diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump
index 80ab0590bc92221e2b2f8f35b76f5a0cbb970f8b..931b0fe3a9483ea7394d6b30d36f92ebade09110 100755 (executable)
--- a/contrib/git-jump/git-jump
+++ b/contrib/git-jump/git-jump
@@ -52,7 +52,7 @@ mode_merge() {
 # editor shows them to us in the status bar.
 mode_grep() {
        cmd=$(git config jump.grepCmd)
-       test -n "$cmd" || cmd="git grep -n"
+       test -n "$cmd" || cmd="git grep -n --column"
        $cmd "$@" |
        perl -pe '
        s/[ \t]+/ /g;