add an option to clear mergeinfo after uptrunk
Merge branch 'master' of github.com:wcyuan/Scripts