projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3078419 d272c84)
Merge branch 'da/p4merge-mktemp-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Feb 2013 00:05:56 +0000 (16:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Feb 2013 00:05:56 +0000 (16:05 -0800)
* da/p4merge-mktemp-fix:
  p4merge: fix printf usage


Trivial merge
Git—the stupid content tracker