projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d34f715 4481ff0)
Merge branch 'da/mergetool-lib'
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:41:51 +0000 (01:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:41:51 +0000 (01:41 -0700)
* da/mergetool-lib:
  mergetool--lib: specialize diff options for emerge and ecmerge


Trivial merge
Git—the stupid content tracker