Mercurial > hg
comparison contrib/mergetools.hgrc @ 6075:63e0e57ab157
filemerge: add 'checkchanged' merge tool property
author | Steve Borho <steve@borho.org> |
---|---|
date | Wed, 06 Feb 2008 20:32:06 -0600 |
parents | 2f424fc4edb3 |
children | 8b67211d9140 |
comparison
equal
deleted
inserted
replaced
6074:59a9dc9562e2 | 6075:63e0e57ab157 |
---|---|
26 xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other | 26 xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other |
27 xxdiff.gui=True | 27 xxdiff.gui=True |
28 xxdiff.priority=-8 | 28 xxdiff.priority=-8 |
29 | 29 |
30 diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other | 30 diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other |
31 diffmerge.checkchanged=True | |
31 diffmerge.gui=True | 32 diffmerge.gui=True |
32 | 33 |
33 p4merge.args=$base $local $other $output | 34 p4merge.args=$base $local $other $output |
34 p4merge.regkey=Software\Perforce\Environment | 35 p4merge.regkey=Software\Perforce\Environment |
35 p4merge.regname=P4INSTROOT | 36 p4merge.regname=P4INSTROOT |