summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar David A. Greene <greened@obbligato.org>2016-01-17 17:47:59 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-01-19 10:15:20 -0800
commit43cce5c8ed48ab955b3347f999cda7c1c33dde0a (patch)
tree09877bd8d8c0b275b7498d6a2920759826504c30 /t/t6037-merge-ours-theirs.sh
parentGit 2.7 (diff)
downloadtgif-43cce5c8ed48ab955b3347f999cda7c1c33dde0a.tar.xz
contrib/subtree: Make testing easier
Add some Makefile dependencies to ensure an updated git-subtree gets copied to the main area before testing begins. Signed-off-by: David A. Greene <greened@obbligato.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions