projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab08517 ec245ba)
Merge branch 'da/maint-mergetool-twoway'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:01:17 +0000 (22:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:01:17 +0000 (22:01 -0800)
* da/maint-mergetool-twoway:
  mergetool: Provide an empty file when needed


Trivial merge
Git—the stupid content tracker