Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
b=14148
[fs/lustre-release.git]
/
build
/
merge2.sh
diff --git
a/build/merge2.sh
b/build/merge2.sh
index
92cb375
..
0ef27cc
100755
(executable)
--- a/
build/merge2.sh
+++ b/
build/merge2.sh
@@
-1,4
+1,4
@@
-#!/bin/sh -e
+#!/bin/
ba
sh -e
if [ ! -f .mergeinfo ] ; then
echo ".mergeinfo doesn't exist - exit"