]> asedeno.scripts.mit.edu Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f569fe 208fe3a)
Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 29 Sep 2007 22:39:39 +0000 (15:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 29 Sep 2007 22:39:39 +0000 (15:39 -0700)
* 'mergetool' of git://repo.or.cz/git/mergetool:
  mergetool: Fix typo in options passed to kdiff3
  mergetool: fix emerge when running in a subdirectory
  Mergetool generating blank files (1.5.3)


Trivial merge
local clone of git.git