slitaz-doc-wiki-data view meta/en/cookbook/advancedhg.meta @ rev 142
Updated en:handbook:start to 4.0
| author | Christian Mesh meshca@clarkson.edu |
|---|---|
| date | Mon Mar 19 22:02:10 2012 +0000 (2012-03-19) |
| parents | |
| children |
line source
1 a:2:{s:7:"current";a:8:{s:4:"date";a:2:{s:7:"created";i:1295469563;s:8:"modified";i:1295895308;}s:7:"creator";s:13:"Antoine Bodin";s:11:"last_change";a:7:{s:4:"date";i:1295895308;s:2:"ip";s:13:"91.104.86.126";s:4:"type";s:1:"E";s:2:"id";s:22:"en:cookbook:advancedhg";s:4:"user";s:5:"linea";s:3:"sum";s:0:"";s:5:"extra";s:0:"";}s:11:"contributor";a:1:{s:5:"linea";s:11:"Paul Issott";}s:5:"title";s:27:"Advanced usage of Mercurial";s:11:"description";a:2:{s:15:"tableofcontents";a:1:{i:0;a:4:{s:3:"hid";s:27:"advanced-usage-of-mercurial";s:5:"title";s:27:"Advanced usage of Mercurial";s:4:"type";s:2:"ul";s:5:"level";i:1;}}s:8:"abstract";s:399:"Use an external tool to merge
4 If you want to use tools presented on this page, MQ particularly has a tool to manage merges (when several commits overwrite each other and you have to edit the result manually) which will probably be useful to you. SliTaz proposes Meld, a light software that can do that well. After installation, tell Mercurial to use it if necessary by putting it in your ~/.hgrc:";}s:8:"internal";a:2:{s:5:"cache";b:1;s:3:"toc";b:1;}s:8:"relation";a:1:{s:10:"firstimage";s:0:"";}}s:10:"persistent";a:4:{s:4:"date";a:2:{s:7:"created";i:1295469563;s:8:"modified";i:1295895308;}s:7:"creator";s:13:"Antoine Bodin";s:11:"last_change";a:7:{s:4:"date";i:1295895308;s:2:"ip";s:13:"91.104.86.126";s:4:"type";s:1:"E";s:2:"id";s:22:"en:cookbook:advancedhg";s:4:"user";s:5:"linea";s:3:"sum";s:0:"";s:5:"extra";s:0:"";}s:11:"contributor";a:1:{s:5:"linea";s:11:"Paul Issott";}}}