Merge branch 'jc/maint-merge-recursive-fix' into next
[git] / Documentation / git-difftool.txt
2009-04-18  Junio C HamanoMerge branch 'eb/upload-archive-from-git-shell'
2009-04-18  Junio C HamanoMerge branch 'jc/shared-literally'
2009-04-18  Junio C HamanoMerge branch 'ns/am-to-empty'
2009-04-18  Junio C HamanoMerge branch 'bw/short-ref-strict'
2009-04-18  Junio C HamanoMerge branch 'da/difftool'
2009-04-08  David Aguilardifftool: add support for a difftool.prompt config...
2009-04-08  David Aguilardifftool: move 'git-difftool' out of contrib