summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-09-18 14:55:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-18 14:55:08 -0700
commit87b50542a08ac6caa083ddc376e674424e37940a (patch)
treeb5fa1a17653865c072390cdf8c16cf0fb3278fac /t/t3309-notes-merge-auto-resolve.sh
parentMerge branch 'js/ls-files-x-doc' (diff)
downloadtgif-87b50542a08ac6caa083ddc376e674424e37940a.tar.xz
Git 1.7.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions