summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2010-04-11 08:43:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-11 19:13:13 (GMT)
commitfe90c93bee8fc72240ccbaf9480f80ed6766cd1c (patch)
treece6631d536f0ac859b9327173f2ed5a58c737844 /t/t3507-cherry-pick-conflict.sh
parentb9aa901856cee7ad16737343f6a372bb37871258 (diff)
downloadgit-fe90c93bee8fc72240ccbaf9480f80ed6766cd1c.zip
git-fe90c93bee8fc72240ccbaf9480f80ed6766cd1c.tar.gz
git-fe90c93bee8fc72240ccbaf9480f80ed6766cd1c.tar.bz2
t3507: Make test executable
Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
-rwxr-xr-x[-rw-r--r--]t/t3507-cherry-pick-conflict.sh0
1 files changed, 0 insertions, 0 deletions
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index e25cf80..e25cf80 100644..100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh