Make difftool.prompt fall back to mergetool.prompt
[gitweb.git] / hex.c
2010-01-22 Merge branch 'maint'
2010-01-22 slim down "git show-index"