aboutsummaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-15 12:07:18 -0700
committerJunio C Hamano <gitster@pobox.com>2010-07-15 12:07:18 -0700
commita7d7853463ae77fc3c8511283f5c896bee673b33 (patch)
treed9a04cf599c9ef510090509d72a49b76c77a7bd9 /merge-file.c
parentcb597adb5cb989540ebd77afc9507cd24d6c70bd (diff)
parente7b082a4118d15e901f4f44b067394b314a0ae6a (diff)
downloadgit-a7d7853463ae77fc3c8511283f5c896bee673b33.tar.gz
git-a7d7853463ae77fc3c8511283f5c896bee673b33.tar.xz
Merge branch 'jn/grep-open'
* jn/grep-open: grep -O: Do not pass color sequences as filenames to pager
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions