git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8272bca 0a0ec7b)
Merge branch 'cj/p4merge' into maint
authorJunio C Hamano <redacted>
Fri, 13 May 2011 17:44:46 +0000 (10:44 -0700)
committerJunio C Hamano <redacted>
Fri, 13 May 2011 17:44:46 +0000 (10:44 -0700)
* cj/p4merge:
  Pass empty file to p4merge where no base is suitable.


Trivial merge
git clone https://git.99rst.org/PROJECT