projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2da61dc 0a0ec7b)
Merge branch 'cj/p4merge'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:52:16 +0000 (10:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:52:16 +0000 (10:52 -0700)
* cj/p4merge:
  Pass empty file to p4merge where no base is suitable.


Trivial merge
Git—the stupid content tracker