# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: address@hidden # target_branch: bzr://bzr.savannah.gnu.org/emacs/trunk/ # testament_sha1: 288f9778d7a38f15b67ce5fcf41241cbf691f767 # timestamp: 2013-09-24 23:21:00 -0700 # base_revision_id: address@hidden # # Begin patch === modified file 'lisp/vc/vc-git.el' --- lisp/vc/vc-git.el 2013-09-12 05:45:42 +0000 +++ lisp/vc/vc-git.el 2013-09-25 06:20:33 +0000 @@ -1082,7 +1082,7 @@ (setq command nil)) (setq dir (file-name-as-directory (expand-file-name dir))) (setq command - (grep-expand-template "git grep -n -e -- " + (grep-expand-template "git --no-pager grep --no-color -n -e -- " regexp files)) (when command (if (equal current-prefix-arg '(4)) # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRQNG34AAZLfgBAwUGP/91NC EAC////wUANy7g5Pe9NRz0Mogm01PSntCniemlNPI2pDQZAPQaEJo000DQmmowhoGjQ09Q8oJJAE ammmk8JT01GIaGmQDQwZKZqgaeo9TID1Gm1AAAAAkkmmSntTSZppG09RMQPU9EAAFKnpwafSGouu lKBuABxvVe1GQKrxVD5z+vu30tMzC+hSLmMXhEMYvz6v919dVrOk2IQhXdQ6hMsuQQ8DIbklsQ5z i7r+n8BckS5zPmD7ER/bBkOQKnvt4G+Wwn5LDUwmJtvdlx2lBTJI4TX2oIIbgRiAjwgLM5RoLAWM QTDHV8YqsUwiCioA4gzuivU5TvgqHLtd4UFFcj4c/dcSwPJozjd1T0eIpQa3RSzOy+dN+p4Qd37D y/28dYncbHJkjgKJAzusaWqOQV5qt+O+4IJPLPSKsa5JUTBDbBmkSkQvjL0iJ965VXook3wesNdw FFrShleKRLcdcjEzz0IVJpzC0MFF7FrYjUYI0sKlBId2g5DQnupcCmXuQEsbUGxulFThZWSrbRCL oigGu9N4e95IIDKZuy1KwigbWDeCMME6Nc2d4st1TGRXiy4Mg46UJ8bGV+MMruDGFbPV7mldc8i9 MTo6RUKVbM8hvnxu6u9nt0/H+8/Gq0SdQswx5u/mHY6rLSjyxeSTgjPXf41cK/PB+IUmhLkBmzU2 w7GREtbCni3CzQY75Nh2y0wOoxAQchoILY0HEYTBd5O5Cy8l7RVO2HAmf2aQerpUvRUYXKVKSGE7 6Q5ZTxQXZonnz6JXedMHrQtM6gIUk2uMo0jUKDusN06j3T8EV/SQ3kMigGoYKkojLWO6XCcByjE7 iIGoXmAhtHnnDq9IxGfIsqWla1jccCPgBX900gb22BY7Yy42qyY9KwtgvUol8RWS4xBotAZVc2Ko CC8wE3kbydUUbJKDX4Wm4OkNqTBUFTg0pQV8OLHx1QunyJOclcBtW8Ub5HuSGonqri8lburIBuaK oBzPvYsIoey53LAU5kS3UIgiFBcSDHmV9Cy2GjILONhdQyeTShF5XOUsh0pjZuTg5vRmo+yxJ8+t 6xdugEAb7bKW2+JXixdEGku3RKEySHYtkydsn6FogRfa/gbR4OnHMlzgPAYZPrBVFkF4KsKrPKXV /MYx48TgWIEhYULFeK+gnGR3Z1DRatZDoObmKMrvUXckU4UJAUDRt+A=