ll-merge: use a longer conflict marker for internal merge
[gitweb.git] / t / t4018 / java-class-member-function
2014-06-03 Merge branch 'jk/external-diff-use-argv-array'
2014-06-03 Merge branch 'sk/svn-parse-datestamp'
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-06-03 Merge branch 'as/grep-fullname-config'
2014-05-30 Sync with 1.9.4
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-09 Sync with 1.9.3
2014-05-08 Sync with 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-28 Merge branch 'jk/external-diff-use-argv-array' (early...
2014-04-24 Merge branch 'jk/pack-bitmap'
2014-04-21 Merge branch 'km/avoid-non-function-return-in-rebase'
2014-04-21 Merge branch 'ep/shell-command-substitution'
2014-04-18 Merge branch 'jk/config-die-bad-number-noreturn'
2014-04-18 Merge branch 'fc/remote-helper-fixes'
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 Sync with 1.9.2
2014-04-08 Merge branch 'maint'
2014-04-08 Merge branch 'jk/pack-bitmap'
2014-04-08 Merge branch 'jl/nor-or-nand-and'
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 'ib/rev-parse-parseopt-argh'
2014-04-08 Merge branch 'mr/msvc-link-with-invalidcontinue'
2014-04-08 Merge branch 'jc/rev-parse-argh-dashed-multi-words'
2014-04-08 Merge branch 'jk/commit-dates-parsing-fix'
2014-04-03 Merge branch 'maint'
2014-04-03 Merge branch 'nd/gc-aggressive'
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-03 Merge branch 'ep/shell-command-substitution'
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 'an/branch-config-message'
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 'mr/msvc-link-with-lcurl'
2014-03-31 Merge branch 'ib/rev-parse-parseopt-argh'
2014-03-31 Merge branch 'dp/makefile-charset-lib-doc'
2014-03-31 Merge branch 'js/userdiff-cc'
2014-03-21 t4018: convert java pattern test to the new infrastructure