aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/merge.sh
Commit message (Expand)AuthorAgeFilesLines
* Abort if merge failsArtur Signell2012-02-021-0/+6
* Optionally read password from fileArtur Signell2012-02-021-0/+5
* merge.sh now works in directories other than /versions/, like merge-all.sh al...Johannes Dahlström2012-01-311-2/+5
* User SVN_USER and SVN_PASS if givenArtur Signell2012-01-271-1/+7
* Scripts for easing merge from 6.7Artur Signell2012-01-271-0/+39