projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b4ec3f 284a126)
Merge branch 'th/mergetools-deltawalker'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:07 +0000 (14:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:07 +0000 (14:53 -0800)
By Tim Henigan
* th/mergetools-deltawalker:
  mergetools: add a plug-in to support DeltaWalker


Trivial merge
Git—the stupid content tracker