summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-14 11:46:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-14 11:46:31 -0700
commit971f9ea54313d189e6a79395b5a6e335101bd85a (patch)
treea72e52a90f2dbceca13b69d9776f99012df8b06b /notes-merge.c
parentMerge branch 'gb/apply-comment-typofix' (diff)
parentt7060: actually test "git diff-index --cached -M" (diff)
downloadtgif-971f9ea54313d189e6a79395b5a6e335101bd85a.tar.xz
Merge branch 'mp/t7060-diff-index-test'
Fix an old test that was doing the same thing as another one. * mp/t7060-diff-index-test: t7060: actually test "git diff-index --cached -M"
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions