My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab54cd6 446247d)
Merge branch 'mv/maint-merge-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 21:29:37 +0000 (14:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 21:29:37 +0000 (14:29 -0700)
* mv/maint-merge-fix:
  merge: fix numerus bugs around "trivial merge" area


Trivial merge
The core git plumbing