diff options
| -rwxr-xr-x | scripts/review | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/review b/scripts/review index 3668adc63..cb9070654 100755 --- a/scripts/review +++ b/scripts/review @@ -192,9 +192,9 @@ fi ebegin "Merging in changes..." if [[ "$opt_verbose" == "1" ]] ; then - svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed --ignore-ancestry + svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed else - svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed -q --ignore-ancestry + svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed -q fi eend ${?} |