diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-06 10:41:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-06 10:41:17 -0700 |
| commit | 0c41f33c19c2f40015e31211557e818b000f9a25 (patch) | |
| tree | 082c327638afe97d14a8417603034537392f4d8d /git-mergetool--lib.sh | |
| parent | df0a6aeb35be7855fc96417cd01dce3e8e5146f5 (diff) | |
| parent | 313ee0d69f58c2bf2f4e0a62b812c9d08a39b240 (diff) | |
| download | git-0c41f33c19c2f40015e31211557e818b000f9a25.tar.gz git-0c41f33c19c2f40015e31211557e818b000f9a25.tar.xz | |
Merge branch 'nm/maint-conflicted-submodule-entries' into maint
* nm/maint-conflicted-submodule-entries:
submodule: process conflicting submodules only once
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions