##// END OF EJS Templates
mergetools: don't let meld open all changed files on startup...
Mathias De Mare -
r50398:a6efc1f1 default
parent child Browse files
Show More
@@ -107,7 +107,7 b' kdiff3.regkeyalt=Software\\Wow6432Node\\KD'
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
General Comments 0
You need to be logged in to leave comments. Login now