* nm/maint-conflicted-submodule-entries (2011-03-30) 1 commit
(merged to 'next' on 2011-04-03 at 40c5094)
+ submodule: process conflicting submodules only once
A fix to a rather common operation and the implementation looked
low-impact enough. Do submodule people want this in 1.7.5?