summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-01-28 16:10:13 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-01-28 16:10:13 -0800
commit4b16573ce99c46e8c5b4950c44b70f1584b8dca9 (patch)
tree61179e1f3dcec7d7718207f0178fafd52eaffae9 /git-merge-one-file.sh
parentMerge branch 'jk/filter-branch-no-index' (diff)
parenttest-lib: clarify and tighten SANITY (diff)
downloadtgif-4b16573ce99c46e8c5b4950c44b70f1584b8dca9.tar.xz
Merge branch 'jk/sanity'
The description for SANITY prerequisite the test suite uses has been clarified both in the comment and in the implementation. * jk/sanity: test-lib: clarify and tighten SANITY
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions