AaronGhent · January 3, 2016 12:59
diff --git a/p4merge mercurial intergration b/p4merge mercurial intergration
 [ui]
 merge = p4merge

 [extensions]
 hgext.extdiff =
       
 [extdiff]
 cmd.p4diff = p4merge

 [tortoisehg]
 vdiff = p4diff

 [merge-tools] 
 p4merge.priority = 100 
 p4merge.premerge = True
 p4merge.gui = True 
 p4merge.args = $base $local $other $output
 p4merge.diffargs = $parent $child
 p4merge.diff3args = $child $parent1 $parent2
 p4merge.dirdiff = False
 p4merge.checkchanged = True
	[ui]
	merge = p4merge

	[extensions]
	hgext.extdiff =

	[extdiff]
	cmd.p4diff = p4merge

	[tortoisehg]
	vdiff = p4diff

	[merge-tools]
	p4merge.priority = 100
	p4merge.premerge = True
	p4merge.gui = True
	p4merge.args = $base $local $other $output
	p4merge.diffargs = $parent $child
	p4merge.diff3args = $child $parent1 $parent2
	p4merge.dirdiff = False
	p4merge.checkchanged = True