summaryrefslogtreecommitdiffstats
path: root/git_hooks
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2011-06-24 17:51:02 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2011-06-24 17:51:02 +0200
commitb1bfcb099eb73e8305f02951f53309a58d7d98a0 (patch)
tree8efd8bcab184b9b51b71b1f8268c5d5be1153c5f /git_hooks
parent73cfbb978620c9a34466bb3ec789de774e99a336 (diff)
downloadscilab-b1bfcb099eb73e8305f02951f53309a58d7d98a0.zip
scilab-b1bfcb099eb73e8305f02951f53309a58d7d98a0.tar.gz
Fix a merge issue
Change-Id: Ic2b8a981c341643f76936b053b12b859999b1966
Diffstat (limited to 'git_hooks')
-rwxr-xr-xgit_hooks/pre-commit4
1 files changed, 0 insertions, 4 deletions
diff --git a/git_hooks/pre-commit b/git_hooks/pre-commit
index a3bcada..34585eb 100755
--- a/git_hooks/pre-commit
+++ b/git_hooks/pre-commit
@@ -54,7 +54,6 @@ then
54 echo 54 echo
55fi 55fi
56 56
57<<<<<<< HEAD
58if test -z "$(git config --get-all indent.ignored)" 57if test -z "$(git config --get-all indent.ignored)"
59then 58then
60 echo "Unable to find indent ignored list on the configuration, ignored" 59 echo "Unable to find indent ignored list on the configuration, ignored"
@@ -69,9 +68,6 @@ else
69 INDENT_IGNORED="$(find $(git config --get-all indent.ignored))" 68 INDENT_IGNORED="$(find $(git config --get-all indent.ignored))"
70fi 69fi
71 70
72=======
73#
74>>>>>>> 465c595... deactivate pre-commit on in-progress state
75# indent / format file by type 71# indent / format file by type
76# 72#
77indent() { 73indent() {