Skip to content
  • Junio C Hamano's avatar
    Merge branch 'da/mergetool-custom' · 5ec11ab3
    Junio C Hamano authored
    The actual external command to run for mergetool backend can be
    specified with difftool/mergetool.$name.cmd configuration
    variables, but this mechanism was ignored for the backends we
    natively support.
    
    * da/mergetool-custom:
      mergetool--lib: Allow custom commands to override built-ins
    5ec11ab3