mergemaster.sh revision 6b5b49ce
1