![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Aug 2008 21:29:37 +0000 (14:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Aug 2008 21:29:37 +0000 (14:29 -0700) | ||
| commit | 97e5f4908dd22c99e825ccb254f05a61fda8d19c | |
| tree | 72d9d7d5d33393551b0d68df71b254863be5e42f | tree | snapshot |
| parent | ab54cd6c4d54b7d9bf6dccfa7ea54f209ea76601 | commit | diff |
| parent | 446247db78a733f44d2470afb1f1983d28058159 | commit | diff |
Merge branch 'mv/maint-merge-fix' into maint
* mv/maint-merge-fix:
merge: fix numerus bugs around "trivial merge" area
* mv/maint-merge-fix:
merge: fix numerus bugs around "trivial merge" area