• Junio C Hamano's avatar
    Merge branch 'da/mergetool-xxdiff-hotkey' · a3c98872
    Junio C Hamano authored
    The way to specify hotkeys to "xxdiff" that is used by "git
    mergetool" has been modernized to match recent versions of xxdiff.
    
    * da/mergetool-xxdiff-hotkey:
      mergetools: fix xxdiff hotkeys
    a3c98872
xxdiff 584 Bytes