Skip to content
Snippets Groups Projects
Select Git revision
0 results

mergetools

  • Clone with SSH
  • Clone with HTTPS
  • user avatar
    Stefan Saasen authored
    DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and Linux.
    
        See http://www.sourcegear.com/diffmerge/
    
    
    
    DiffMerge includes a script `/usr/bin/diffmerge` that can be used to launch the
    graphical compare tool.
    
    This change adds mergetool support for DiffMerge and adds 'diffmerge' as an
    option to the mergetool help.
    
    Signed-off-by: default avatarStefan Saasen <ssaasen@atlassian.com>
    Acked-by: default avatarDavid Aguilar <davvid@gmail.com>
    Signed-off-by: default avatarJonathan Nieder <jrnieder@gmail.com>
    c5f424fd
    History
    Code owners
    Assign users and groups as approvers for specific file changes. Learn more.
    Name Last commit Last update
    ..