merge: detect delete/modechange conflict
[gitweb.git] / t / t5561-http-backend.sh
2014-06-09 Merge branch 'lt/request-pull'
2014-06-06 Merge branch 'jn/test-lint-unmoor'
2014-06-06 Merge branch 'ep/shell-assign-and-export-vars'
2014-06-06 Merge branch 'mt/rebase-i-keep-empty-test'
2014-06-06 Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
2014-06-06 Merge branch 'sk/spawn-less-case-insensitively-from...
2014-06-06 Merge branch 'tb/unicode-6.3-zero-width'
2014-06-06 Merge branch 'bc/blame-crlf-test'
2014-06-06 Merge branch 'sk/submodules-absolute-path-on-windows'
2014-06-06 Merge branch 'fc/status-printf-squelch-format-zero...
2014-06-06 Merge branch 'jk/commit-C-pick-empty'
2014-06-03 Merge branch 'fc/rerere-conflict-style'
2014-06-03 Merge branch 'nd/index-pack-one-fd-per-thread'
2014-06-03 Merge branch 'ym/fix-opportunistic-index-update-race'
2014-06-03 Merge branch 'ks/tree-diff-nway'
2014-06-03 Merge branch 'jc/apply-ignore-whitespace'
2014-05-28 Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
2014-05-28 Merge branch 'mw/symlinks' into maint
2014-05-19 Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
2014-05-19 Merge branch 'lt/request-pull'
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-05-19 Merge branch 'kb/fast-hashmap'
2014-05-08 Merge branch 'cl/p4-use-diff-tree' into maint
2014-05-08 Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
2014-05-08 Merge branch 'tb/unicode-6.3-zero-width' into maint
2014-05-08 Merge branch 'km/avoid-bs-in-shell-glob' into maint
2014-05-08 Merge branch 'km/avoid-cp-a' into maint
2014-05-07 Merge branch 'cl/p4-use-diff-tree'
2014-05-02 Merge branch 'mw/symlinks'
2014-05-02 Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
2014-04-24 Merge branch 'jk/pack-bitmap'
2014-04-18 Merge branch 'jk/config-die-bad-number-noreturn'
2014-04-16 Merge branch 'mh/multimail'
2014-04-16 Merge branch 'tb/unicode-6.3-zero-width'
2014-04-16 Merge branch 'km/avoid-cp-a'
2014-04-16 Merge branch 'km/avoid-bs-in-shell-glob'
2014-04-09 Merge branch 'cn/fetch-prune-overlapping-destination...
2014-04-09 Merge branch 'mh/update-ref-batch-create-fix' into...
2014-04-09 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09 Merge branch 'jc/fix-diff-no-index-diff-opt-parse'...
2014-04-09 Merge commit 'doc/http-backend: missing accent grave...
2014-04-08 Merge branch 'mm/status-porcelain-format-i18n-fix'...
2014-04-08 Merge branch 'bp/commit-p-editor' into maint
2014-04-08 Merge branch 'jk/pack-bitmap'
2014-04-08 Merge branch 'mh/update-ref-batch-create-fix'
2014-04-08 Merge branch 'mr/opt-set-ptr'
2014-04-08 Merge branch 'jk/commit-dates-parsing-fix'
2014-04-03 Merge branch 'jk/mv-submodules-fix' into maint
2014-04-03 Merge branch 'mh/remove-subtree-long-pathname-fix'...
2014-04-03 Merge branch 'jk/lib-terminal-lazy' into maint
2014-04-03 Merge branch 'nd/index-pack-error-message' into maint
2014-04-03 Merge branch 'us/printf-not-echo' into maint
2014-04-03 Merge branch 'rr/doc-merge-strategies' into maint
2014-04-03 Merge branch 'jk/shallow-update-fix' into maint
2014-04-03 Merge branch 'jc/stash-pop-not-popped' into maint
2014-04-03 Merge branch 'jn/wt-status' into maint
2014-04-03 Merge branch 'jc/fix-diff-no-index-diff-opt-parse'
2014-04-03 Merge branch 'cb/aix'
2014-04-03 Merge branch 'cn/fetch-prune-overlapping-destination'
2014-04-03 Merge branch 'nd/log-show-linear-break'
2014-04-02 Merge branch 'ap/remote-hg-skip-null-bookmarks'
2014-04-02 Merge branch 'rs/pickaxe-i'
2014-03-31 Merge branch 'mm/status-porcelain-format-i18n-fix'
2014-03-31 Merge branch 'jk/tests-cleanup'
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-2'
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-31 Merge branch 'dp/makefile-charset-lib-doc'
2014-03-31 Merge branch 'js/userdiff-cc'
2014-03-31 Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'
2014-03-31 Merge branch 'ca/doc-config-third-party'
2014-03-31 Merge branch 'hs/simplify-bit-setting-in-fsck-tree'
2014-03-31 Merge branch 'dt/tests-with-env-not-subshell'
2014-03-28 Merge branch 'ys/fsck-commit-parsing'
2014-03-28 Merge branch 'bg/rebase-off-of-previous-branch'
2014-03-28 Merge branch 'bp/commit-p-editor'
2014-03-28 Merge branch 'ah/doc-gitk-config'
2014-03-28 Merge branch 'fr/add-interactive-argv-array'
2014-03-28 Merge branch 'jk/pack-bitmap'
2014-03-25 Merge branch 'ss/test-on-mingw-rsync-path-no-absolute'
2014-03-25 Merge branch 'bb/diff-no-index-dotdot'
2014-03-25 Merge branch 'us/printf-not-echo'
2014-03-25 Merge branch 'rr/doc-merge-strategies'
2014-03-25 Merge branch 'nd/index-pack-error-message'
2014-03-25 Merge branch 'jk/lib-terminal-lazy'
2014-03-25 Merge branch 'dm/configure-iconv-locale-charset'
2014-03-25 Merge branch 'nd/commit-editor-cleanup'
2014-03-25 Merge branch 'jk/warn-on-object-refname-ambiguity'
2014-03-25 Merge branch 'mh/remove-subtree-long-pathname-fix'
2014-03-25 Merge branch 'nd/indent-fix-connect-c'
2014-03-25 Merge branch 'jk/mv-submodules-fix'
2014-03-25 Merge branch 'cp/am-patch-format-doc'
2014-03-21 Merge branch 'lt/request-pull'
2014-03-21 Merge branch 'es/sh-i18n-envsubst'
2014-03-21 Merge branch 'nd/upload-pack-shallow'
2014-03-21 Merge branch 'jn/wt-status'
2014-03-21 Merge branch 'jc/stash-pop-not-popped'
2014-03-21 Merge branch 'dk/skip-prefix-scan-only-once'
2014-03-21 Merge branch 'nd/tag-version-sort'
2014-03-21 Merge branch 'jk/shallow-update-fix'
2014-03-21 Merge branch 'tc/commit-dry-run-exit-status-tests'
next