![[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) | ||
| commit | 0c41f33c19c2f40015e31211557e818b000f9a25 | |
| tree | 082c327638afe97d14a8417603034537392f4d8d | tree | snapshot |
| parent | df0a6aeb35be7855fc96417cd01dce3e8e5146f5 | commit | diff |
| parent | 313ee0d69f58c2bf2f4e0a62b812c9d08a39b240 | commit | diff |
Merge branch 'nm/maint-conflicted-submodule-entries' into maint
* nm/maint-conflicted-submodule-entries:
submodule: process conflicting submodules only once
* nm/maint-conflicted-submodule-entries:
submodule: process conflicting submodules only once