../ kompare meld vimdiff smerge tkdiff ecmerge xxdiff araxis p4merge examdiff deltawalker codecompare opendiff diffuse gvimdiff guiffy winmerge kdiff3 emerge nvimdiff tortoisemerge bc diffmerge