aboutsummaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-06 14:53:07 -0800
committerJunio C Hamano <gitster@pobox.com>2012-03-06 14:53:07 -0800
commitf4464a3b7c9319011acf7b813b0217e244f4954e (patch)
tree8be249b9189b9b6b6a2d687e1babce08832b1c6b /git-gui
parent4b4ec3fc6480312515e1ec3d827c1308c00adc1e (diff)
parent284a126c3ef3dfedede9bc64df4cf3a24600dea5 (diff)
downloadgit-f4464a3b7c9319011acf7b813b0217e244f4954e.tar.gz
git-f4464a3b7c9319011acf7b813b0217e244f4954e.tar.xz
Merge branch 'th/mergetools-deltawalker'
By Tim Henigan * th/mergetools-deltawalker: mergetools: add a plug-in to support DeltaWalker
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions