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
Revert "b=19808 2.6.29-fc11 patchless client support"
[fs/lustre-release.git]
/
build
/
merge1.sh
diff --git
a/build/merge1.sh
b/build/merge1.sh
index
1c9f68f
..
cbd3227
100755
(executable)
--- a/
build/merge1.sh
+++ b/
build/merge1.sh
@@
-1,4
+1,4
@@
-#!/bin/sh -e
+#!/bin/
ba
sh -e
CONFLICTS=cvs-merge-conflicts
CVS="cvs -z3"