ll-merge: use a longer conflict marker for internal merge
[gitweb.git] / t / t4047-diff-dirstat.sh
2015-05-11 Merge branch 'jc/diff-no-index-d-f' into maint-2.3
2015-05-11 Merge branch 'oh/fix-config-default-user-name-section...
2015-05-11 Merge branch 'jc/epochtime-wo-tz' into maint-2.3
2015-04-27 Merge branch 'tb/connect-ipv6-parse-fix' into maint
2015-04-27 Merge branch 'ma/bash-completion-leaking-x' into maint
2015-04-27 Merge branch 'jc/push-cert' into maint
2015-04-21 Merge branch 'jk/colors' into maint
2015-04-21 Merge branch 'jk/test-annoyances' into maint
2015-04-21 Merge branch 'pt/enter-repo-comment-fix' into maint
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-21 Merge branch 'jk/cherry-pick-docfix' into maint
2015-04-21 Merge branch 'iu/fix-parse-options-h-comment' into...
2015-04-21 Merge branch 'jg/cguide-we-cannot-count' into maint
2015-04-21 Merge branch 'jk/pack-corruption-post-mortem' into...
2015-04-21 Merge branch 'jn/doc-fast-import-no-16-octopus-limit...
2015-03-31 Merge branch 'ss/pull-rebase-preserve' into maint
2015-03-31 Merge branch 'jc/report-path-error-to-dir' into maint
2015-03-31 Merge branch 'ph/push-doc-cas' into maint
2015-03-28 Merge branch 'jk/simplify-csum-file-sha1fd-check' into...
2015-03-28 Merge branch 'tg/test-index-v4' into maint
2015-03-28 Merge branch 'nd/doc-git-index-version' into maint
2015-03-28 Merge branch 'ct/prompt-untracked-fix' into maint
2015-03-28 Merge branch 'ws/grep-quiet-no-pager' into maint
2015-03-28 Merge branch 'jc/submitting-patches-mention-send-email...
2015-03-28 Merge branch 'jk/cleanup-failed-clone' into maint
2015-03-28 Merge branch 'jk/fetch-pack' into maint
2015-03-28 Merge branch 'tg/fix-check-order-with-split-index'...
2015-03-27 Merge branch 'jk/tag-h-column-is-a-listing-option'...
2015-03-27 Merge branch 'jk/smart-http-hide-refs' into maint
2015-03-27 Merge branch 'js/completion-ctags-pattern-substitution...
2015-03-23 Merge branch 'rs/use-isxdigit' into maint
2015-03-23 Merge branch 'rs/deflate-init-cleanup' into maint
2015-03-23 Merge branch 'ak/git-done-help-cleanup' into maint
2015-03-23 Merge branch 'sg/completion-remote' into maint
2015-03-23 Merge branch 'mg/doc-status-color-slot' into maint
2015-03-23 Merge branch 'jc/decorate-leaky-separator-color' into...
2015-03-23 Merge branch 'kn/git-cd-to-empty' into maint
2015-03-23 Merge branch 'km/imap-send-libcurl-options' into maint
2015-03-23 Merge branch 'mg/verify-commit' into maint
2015-03-23 Merge branch 'es/rebase-i-count-todo' into maint
2015-03-23 Merge branch 'tb/connect-ipv6-parse-fix' into maint
2015-03-14 Merge branch 'mr/doc-clean-f-f' into maint
2015-03-14 Merge branch 'ak/t5516-typofix' into maint
2015-03-14 Merge branch 'jc/diff-test-updates' into maint
2015-03-14 Merge branch 'jk/diffcore-rename-duplicate' into maint
2015-03-14 Merge branch 'bw/kwset-use-unsigned' into maint
2015-03-14 Merge branch 'nd/grep-exclude-standard-help-fix' into...
2015-03-14 Merge branch 'mg/doc-remote-tags-or-not' into maint
2015-03-14 Merge branch 'mk/diff-shortstat-dirstat-fix' into maint
2015-03-05 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-03-02 diff --shortstat --dirstat: remove duplicate output
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-01-12 Merge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-07 Merge branch 'sb/t5400-remove-unused'
2014-12-22 Merge branch 'rw/apply-does-not-take-ignore-date'
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14 Merge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30 Merge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26 Merge branch 'sb/help-unknown-command-sort-fix'
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27 Merge git://ozlabs.org/~paulus/gitk
2014-06-26 Merge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26 Merge git://repo.or.cz/git-gui
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-03-18 Merge branch 'jk/config-path-include-fix' into maint
2014-02-27 Merge branch 'bs/stdio-undef-before-redef'
2014-02-27 Merge branch 'jk/config-path-include-fix'
2014-01-23 Merge git://ozlabs.org/~paulus/gitk
2014-01-21 Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14 Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-17 Merge branch 'jk/two-way-merge-corner-case-fix' into...
2013-12-09 Merge git://repo.or.cz/git-gui
2013-12-09 Merge git://ozlabs.org/~paulus/gitk
2013-12-05 Merge branch 'jk/two-way-merge-corner-case-fix'
2013-11-07 Merge branch 'vd/doc-unpack-objects' into maint
2013-11-04 Merge branch 'vd/doc-unpack-objects'
2013-10-30 Merge branch 'jk/refs-c-squelch-gcc'
2013-10-30 Merge branch 'jk/date-c-double-semicolon'
2013-10-30 Merge branch 'sg/t3600-nul-sha1-fix'
2013-10-28 Merge branch 'ew/keepalive'
2013-10-14 Merge branch 'rj/highlight-test-hang'
2013-10-14 Merge branch 'nv/doc-config-signingkey'
2013-08-05 Merge branch 'dn/test-reject-utf-16'
2013-07-19 Merge branch 'jc/t1512-fix' into maint
2013-07-11 Merge branch 'jc/t1512-fix'
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-04-03 Merge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03 Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-01 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28 Merge branch 'jk/checkout-attribute-lookup'
2013-03-26 Merge branch 'ob/imap-send-ssl-verify' into maint
2013-03-25 Merge branch 'ap/maint-diff-rename-avoid-overlap'
2013-03-21 Merge branch 'ob/imap-send-ssl-verify'
2013-02-20 Merge branch 'ob/imap-send-ssl-verify' into maint
next