Commits

Steve Borho committed 20afa54

mergetools: force a check of p4merge outputs (refs #2415)

Comments (0)

Files changed (1)

contrib/mergetools.rc

 p4merge.diffargs=$parent $child
 p4merge.diff3args=$child $parent1 $parent2
 p4merge.dirdiff=False
+p4merge.checkchanged = True
 
 tortoisemerge.priority=-9
 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output