Fixed typo
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@148 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
parent
13263e1737
commit
37d32ee749
1 changed files with 1 additions and 1 deletions
2
update
2
update
|
@ -29,7 +29,7 @@ rm -rf aclocal.m4 configure config.guess config.h config.h.in config.sub \
|
||||||
ltmain.sh m4 Makefile.in
|
ltmain.sh m4 Makefile.in
|
||||||
|
|
||||||
svn update
|
svn update
|
||||||
[ -z "$(svn sv|grep '^C')" ] || {
|
[ -z "$(svn st|grep '^C')" ] || {
|
||||||
echo "Some files could not be synchronized with the SVN repository." >&2
|
echo "Some files could not be synchronized with the SVN repository." >&2
|
||||||
echo "You have to manually resolve the merge conflicts and rerun this " \
|
echo "You have to manually resolve the merge conflicts and rerun this " \
|
||||||
"script" >&2
|
"script" >&2
|
||||||
|
|
Loading…
Reference in a new issue