Andrew's git / gitweb.git / diff
?
Merge branch 'nm/maint-conflicted-submodule-entries'
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Apr 2011 10:41:24 +0000 (03:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Apr 2011 10:41:24 +0000 (03:41 -0700)
* nm/maint-conflicted-submodule-entries:
submodule: process conflicting submodules only once

No differences found