diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-04 01:59:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-04 01:59:57 -0700 |
| commit | 7dde4bb3674da53dd9e33c741bea3fe680690a0d (patch) | |
| tree | 01aa8729aef07726076609b355ab1af3848619ab /t | |
| parent | 41872fd573601b123da00294f77d7d4c25db6010 (diff) | |
| parent | 78e3118685bc2050b4ee9ab754dcd79eb2ed4fb7 (diff) | |
| download | git-7dde4bb3674da53dd9e33c741bea3fe680690a0d.tar.gz git-7dde4bb3674da53dd9e33c741bea3fe680690a0d.tar.xz | |
Merge branch 'maint'
* maint:
GIT 1.5.6.2
Fix executable bits in t/ scripts
Work around gcc warnings from curl headers
Diffstat (limited to 't')
| -rwxr-xr-x[-rw-r--r--] | t/t5304-prune.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | t/t7610-mergetool.sh | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index 9fd9d0700..9fd9d0700 100644..100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 6b0483f3e..6b0483f3e 100644..100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh |