]> asedeno.scripts.mit.edu Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4287307 2be08a8)
Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Sat, 17 Mar 2007 07:33:17 +0000 (00:33 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 17 Mar 2007 07:33:17 +0000 (00:33 -0700)
* maint:
  git-merge: finish when git-read-tree fails


Trivial merge
local clone of git.git