Mads Kiilerich 79172c85c8 config: move mergetools configuration from contrib to default configuration ... The merge tool configuration is an essential part of a good initial user experience. 'make osx' installers and direct 'make' installation did not have merge tool configuration. Now they have. Note: The installer fixes for windows have been done blindly and might require additional changes.		2014-10-19 03:22:23 +02:00
..
mergetools.rc	config: move mergetools configuration from contrib to default configuration	2014-10-19 03:22:23 +02:00