Tree - rpms/mercurial - src.fedoraproject.org

Blob History Raw

		2ff9cb4	`--- mercurial-1.1.2/contrib/mergetools.hgrc.orig 2009-02-07 07:14:46.000000000 -0500`
		2ff9cb4	`+++ mercurial-1.1.2/contrib/mergetools.hgrc 2009-02-07 07:14:15.000000000 -0500`
		2ff9cb4	`@@ -46,6 +46,6 @@`
		2ff9cb4	`ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge`
		2ff9cb4	`ecmerge.gui=True`
		78da9c9
		2ff9cb4	`-filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge`
		2ff9cb4	`-filemerge.args=-left $other -right $local -ancestor $base -merge $output`
		2ff9cb4	`-filemerge.gui=True`
		2ff9cb4	`+#filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge`
		2ff9cb4	`+#filemerge.args=-left $other -right $local -ancestor $base -merge $output`
		2ff9cb4	`+#filemerge.gui=True`