Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nm/maint-conflicted-submodule-entries' into maint
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
raw
|
combined
(merge:
df0a6ae
313ee0d
)
Trivial merge