equal
deleted
inserted
replaced
105 kdiff3.regkey=Software\KDiff3 |
105 kdiff3.regkey=Software\KDiff3 |
106 kdiff3.regkeyalt=Software\Wow6432Node\KDiff3 |
106 kdiff3.regkeyalt=Software\Wow6432Node\KDiff3 |
107 |
107 |
108 meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output --auto-merge |
108 meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output --auto-merge |
109 meld.check=changed |
109 meld.check=changed |
110 meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child |
110 meld.diffargs=--label=$plabel1 $parent --label=$clabel $child |
111 meld.gui=True |
111 meld.gui=True |
112 |
112 |
113 merge.check=conflicts |
113 merge.check=conflicts |
114 merge.priority=-100 |
114 merge.priority=-100 |
115 |
115 |