Make difftool.prompt fall back to mergetool.prompt
[gitweb.git] / builtin-hash-object.c
2010-01-22 Merge branch 'maint'
2010-01-22 make "git hash-object" a built-in