Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 22, 2010
  1. @sschuberth @gitster

    Make difftool.prompt fall back to mergetool.prompt

    sschuberth authored gitster committed
    The documentation states that "git-difftool falls back to git-mergetool
    config variables when the difftool equivalents have not been defined".
    Until now, this was not the case for "difftool.prompt".
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Acked-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.