summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-13 22:56:09 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-13 22:56:10 -0700
commitbb8f6de064a2b92febe06c5cbfcf98c686dce8a4 (patch)
tree8fc741454bdeaa37b211ede730c58f72bc36e5c9 /t/t3310-notes-merge-manual-resolve.sh
parent3aab60b3baefd79d113fdc83685ba38c71986538 (diff)
parent817d03e10552c03fce7483df5034d72f883b2fab (diff)
downloadgit-bb8f6de064a2b92febe06c5cbfcf98c686dce8a4.tar.gz
Merge branch 'jc/diff-test-updates' into maint
Test clean-up. * jc/diff-test-updates: test_ln_s_add: refresh stat info of fake symbolic links t4008: modernise style t/diff-lib: check exact object names in compare_diff_raw tests: do not borrow from COPYING and README from the real source t4010: correct expected object names t9300: correct expected object names t4008: correct stale comments
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions