summaryrefslogtreecommitdiff
path: root/t/t6025-merge-symlinks.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-09 13:33:39 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-09 13:33:39 -0800
commit10dd3b2bf1444695416c0dac951297acf7d4e5e4 (patch)
treedfee18f87e5a8e382503931719b285d8a7a226ef /t/t6025-merge-symlinks.sh
parentMerge branch 'maint-1.7.7' into maint (diff)
parentam: don't persist keepcr flag (diff)
downloadtgif-10dd3b2bf1444695416c0dac951297acf7d4e5e4.tar.xz
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7: am: don't persist keepcr flag mingw: give waitpid the correct signature git symbolic-ref: documentation fix
Diffstat (limited to 't/t6025-merge-symlinks.sh')
0 files changed, 0 insertions, 0 deletions