projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27158e4 641dba4)
Merge branch 'ph/mergetool'
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 23:22:42 +0000 (16:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 23:22:42 +0000 (16:22 -0700)
* ph/mergetool:
  Remove the use of '--' in merge program invocation


Trivial merge
Git—the stupid content tracker