![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Apr 2011 17:41:17 +0000 (10:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Apr 2011 17:41:17 +0000 (10:41 -0700) |
* nm/maint-conflicted-submodule-entries:
submodule: process conflicting submodules only once
submodule: process conflicting submodules only once
Trivial merge