t7610-mergetool: use test_cmp instead of test $(cat file) = $txt
[gitweb.git] / t / t6028-merge-up-to-date.sh
2015-04-28 Merge branch 'mg/show-notes-doc'
2015-04-28 Merge branch 'nd/versioncmp-prereleases'
2015-04-28 Merge branch 'mg/status-v-v'
2015-04-27 Sync with 2.3.7
2015-04-21 Sync with maint
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-20 Merge branch 'ps/grep-help-all-callback-arg'
2015-04-20 Merge branch 'tb/connect-ipv6-parse-fix'
2015-04-20 Merge branch 'va/fix-git-p4-tests'
2015-04-20 Merge branch 'jc/push-cert'
2015-04-20 Merge branch 'ma/bash-completion-leaking-x'
2015-04-19 Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-04-14 Merge branch 'jk/colors'
2015-04-14 Merge branch 'jk/merge-quiet'
2015-04-14 Merge branch 'jk/pack-corruption-post-mortem'
2015-04-14 Merge branch 'jc/update-instead-into-void'
2015-04-14 Merge branch 'sb/plug-streaming-leak'
2015-04-14 Merge branch 'jn/doc-fast-import-no-16-octopus-limit'
2015-04-14 Merge branch 'sb/plug-wt-shortstatus-tracking-leak'
2015-04-14 Merge branch 'pt/enter-repo-comment-fix'
2015-04-14 Merge branch 'jz/gitweb-conf-doc-fix'
2015-04-14 Merge branch 'jk/cherry-pick-docfix'
2015-04-14 Merge branch 'iu/fix-parse-options-h-comment'
2015-04-14 Merge branch 'jg/cguide-we-cannot-count'
2015-04-02 Merge branch 'sb/atomic-push'
2015-03-31 Sync with 2.3.5
2015-03-28 Sync with maint
2015-03-28 Merge branch 'ph/push-doc-cas'
2015-03-28 Merge branch 'ss/pull-rebase-preserve'
2015-03-28 Merge branch 'jn/doc-api-errors'
2015-03-27 Sync with maint
2015-03-27 Merge branch 'sb/leaks'
2015-03-27 Merge branch 'maint'
2015-03-27 Merge branch 'russian-l10n' of https://github.com/DJm00...
2015-03-26 Merge branch 'jk/test-chain-lint'
2015-03-24 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-20 t: fix moderate &&-chain breakage
2015-03-05 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'tc/missing-http-proxyauth'
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-17 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
2013-02-07 Merge branch 'ft/transport-report-segv' into maint
2013-02-07 Merge branch 'sb/gpg-plug-fd-leak' into maint
2013-02-06 Merge branch 'sb/gpg-plug-fd-leak'
2013-02-06 Merge branch 'ft/transport-report-segv'
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/maint-fast-import-doc-reorder' into...
2013-01-14 Merge branch 'jk/shortlog-no-wrap-doc' into maint
next