[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af99711 de6f0de)
Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Fri, 16 Feb 2007 23:08:46 +0000 (15:08 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 16 Feb 2007 23:08:46 +0000 (15:08 -0800)
* maint:
  git-merge: minor fix for no_trivial_merge_strategies.


Trivial merge
Git - the stupid content tracker