You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 
David Aguilar 1e86d5b11d mergetools: stop setting $status in merge_cmd() 10 years ago
..
araxis
bc mergetool: rename bc3 to bc 10 years ago
bc3 mergetool: rename bc3 to bc 10 years ago
codecompare
deltawalker
diffmerge mergetools: stop setting $status in merge_cmd() 10 years ago
diffuse
ecmerge
emerge mergetools: stop setting $status in merge_cmd() 10 years ago
gvimdiff mergetools: simplify how we handle "vim" and "defaults" 12 years ago
gvimdiff2 mergetools: simplify how we handle "vim" and "defaults" 12 years ago
gvimdiff3 mergetools: add vimdiff3 mode 11 years ago
kdiff3 mergetools: stop setting $status in merge_cmd() 10 years ago
kompare
meld mergetools/meld: make usage of `--output` configurable and more robust 10 years ago
opendiff
p4merge mergetools/p4merge: create a base if none available 12 years ago
tkdiff
tortoisemerge mergetools: teach tortoisemerge to handle filenames with SP correctly 12 years ago
vimdiff mergetools: add vimdiff3 mode 11 years ago
vimdiff2 mergetools: simplify how we handle "vim" and "defaults" 12 years ago
vimdiff3 mergetools: add vimdiff3 mode 11 years ago
xxdiff