~ubuntu-branches/ubuntu/oneiric/kdesdk/oneiric-updates

1
2
3
4
5
6
#!/bin/sh
echo >&2 "Warning: this script is superfluous"
echo >&2 "Instead, use: svn merge -rBASE:PREV <filename>"
echo >&2

svn merge -r BASE:PREV "$@"