summaryrefslogtreecommitdiff
path: root/gitk-git
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-06 10:41:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-06 10:41:17 -0700
commit0c41f33c19c2f40015e31211557e818b000f9a25 (patch)
tree082c327638afe97d14a8417603034537392f4d8d /gitk-git
parentMerge branch 'mg/rev-list-n-reverse-doc' into maint (diff)
parentsubmodule: process conflicting submodules only once (diff)
downloadtgif-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 'gitk-git')
0 files changed, 0 insertions, 0 deletions