summaryrefslogtreecommitdiff
path: root/t/t4150-am.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-05 15:25:12 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-05 15:25:12 -0800
commit9ef569791f967c1559b498d8f77a2c42a14be2ed (patch)
treeafd2b29be852150fd4f74d57e257ab47729ca86c /t/t4150-am.sh
parentMerge branch 'vr/git-merge-default-to-upstream' (diff)
parentcheckout,merge: loosen overwriting untracked file check based on info/exclude (diff)
downloadtgif-9ef569791f967c1559b498d8f77a2c42a14be2ed.tar.xz
Merge branch 'nd/maint-ignore-exclude'
* nd/maint-ignore-exclude: checkout,merge: loosen overwriting untracked file check based on info/exclude
Diffstat (limited to 't/t4150-am.sh')
0 files changed, 0 insertions, 0 deletions