summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-21 20:01:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-21 20:01:06 (GMT)
commit241b9254e1c8ff071d8054f8b6fbe1883b389d69 (patch)
tree73c6c9da005ffbd2abd2b05f92347fd5c7b0796d /builtin/merge-index.c
parentcab1b013e6f7cc52806926a792c6798f4c7ac4be (diff)
parent3ac4440801905d11de3ba585c2fe306311db6c45 (diff)
downloadgit-241b9254e1c8ff071d8054f8b6fbe1883b389d69.zip
git-241b9254e1c8ff071d8054f8b6fbe1883b389d69.tar.gz
git-241b9254e1c8ff071d8054f8b6fbe1883b389d69.tar.bz2
Merge branch 'ml/maint-grep-doc'
* ml/maint-grep-doc: grep documentation: clarify what files match
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions