![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Apr 2011 10:41:24 +0000 (03:41 -0700) | ||
| committer | Junio 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
submodule: process conflicting submodules only once
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/git-submodule.txt | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-submodule.txt
Simple merge