aboutsummaryrefslogtreecommitdiff
path: root/lib/merge.sh
AgeCommit message (Expand)Author
2016-05-16Update copyright dates, aways use bash instead of sh, since on some systems i...Rob Savoye
2015-08-17remove unused protocols, svn, br, lpRob Savoye
2014-11-17rename cbuild to abeRob Savoye
2014-03-03add GPLv3 copyright blockRob Savoye
2013-09-15add timestamps for the various stages to speed up repeat bui;ds. Make most va...Rob Savoye
2013-06-20add merge_bzr_commit(). Add mor logging, remove copied display functionsRob Savoye
2013-06-19use an r before the revison numberRob Savoye
2013-06-19make merge_branch() use full paths so we can execute it from anywhereRob Savoye
2013-06-19process a diff file into a bzr branchRob Savoye
2013-06-19rename merge_branches() to merge_branch(), work with repeat author ChangeLog ...Rob Savoye
2013-06-19initial support for GCC merges. Currently just fixes the ChangeLog entriesRob Savoye