ll-merge: use a longer conflict marker for internal merge
[gitweb.git] / t / t4003-diff-rename-1.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-05 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-15 tests: do not borrow from COPYING and README from the...
2015-01-12 Merge branch 'rw/apply-does-not-take-ignore-date' into...
2014-12-22 Merge branch 'rw/apply-does-not-take-ignore-date'
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-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-09 Merge git://repo.or.cz/git-gui
2013-12-09 Merge git://ozlabs.org/~paulus/gitk
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-14 Merge branch 'rj/highlight-test-hang'
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-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-02-04 Merge branch 'dl/am-hg-locale' into maint
2013-01-30 Merge git://ozlabs.org/~paulus/gitk
2013-01-28 Merge branch 'dl/am-hg-locale'
2013-01-23 Merge git://ozlabs.org/~paulus/gitk
2013-01-14 Merge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-12 Merge branch 'jk/shortlog-no-wrap-doc'
2013-01-10 Merge branch 'ta/remove-stale-translated-tut' into...
2013-01-08 Merge branch 'ta/remove-stale-translated-tut'
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-08 Merge branch 'os/commit-submodule-ignore' into maint
2012-10-01 Merge branch 'os/commit-submodule-ignore'
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12 Merge git://ozlabs.org/~paulus/gitk
2012-09-12 Merge branch 'da/gitk-reload-tag-contents'
2012-08-24 Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
2012-08-06 Merge branch 'jn/block-sha1' into maint
2012-08-06 Merge branch 'ms/daemon-doc-typo' into maint
2012-08-06 Merge branch 'lm/git-blame-el' into maint
2012-07-24 Merge branch 'jn/block-sha1'
2012-07-22 Merge branch 'jk/maint-commit-amend-only-no-paths'...
2012-07-22 Merge branch 'tg/maint-cache-name-compare' into maint
2012-07-22 Merge branch 'ms/daemon-doc-typo'
2012-07-16 Merge branch 'tg/maint-cache-name-compare'
2012-07-16 Merge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-11 Merge branch 'tg/maint-cache-name-compare' into tg...
2012-06-25 Merge branch 'lp/no-cmd-http-fetch'
2012-06-25 Merge branch 'lm/git-blame-el'
next