summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-10 19:13:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-10 19:13:46 (GMT)
commit055e1e29696c0fb06582c1592ee6b58643dcc514 (patch)
treec02d254d4cd428587da4556b16c550434b09f369 /t/t3507-cherry-pick-conflict.sh
parent3b0c19663e7976cd32188b42e762c980d1bb93d4 (diff)
parenteee49b6ce4b7b3fed28794676c67ad3609f658ac (diff)
downloadgit-055e1e29696c0fb06582c1592ee6b58643dcc514.zip
git-055e1e29696c0fb06582c1592ee6b58643dcc514.tar.gz
git-055e1e29696c0fb06582c1592ee6b58643dcc514.tar.bz2
Merge branch 'jl/maint-submodule-gitfile-awareness'
* jl/maint-submodule-gitfile-awareness: Teach diff --submodule and status to handle .git files in submodules
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions