difftool: fallback on merge.guitool
[gitweb.git] / t / t4046-diff-unmerged.sh
2018-06-18 Merge branch 'en/rename-directory-detection'
2018-06-18 Merge branch 'rd/doc-remote-tracking-with-hyphen'
2018-06-18 Merge branch 'jl/zlib-restore-nul-termination'
2018-06-18 Merge branch 'ab/cred-netrc-no-autodie'
2018-06-18 Merge branch 'km/doc-workflows-typofix'
2018-06-18 Merge branch 'ld/git-p4-updates'
2018-06-18 Merge branch 'rd/diff-options-typofix'
2018-06-18 Merge branch 'rd/comment-typofix-in-sha1-file'
2018-06-13 Merge branch 'jk/index-pack-maint'
2018-06-13 Merge branch 'sg/completion-zsh-workaround'
2018-06-13 Merge branch 'sb/submodule-merge-in-merge-recursive'
2018-06-13 Merge branch 'jk/submodule-fsck-loose-fixup'
2018-06-04 Merge branch 'bc/t3430-fixup'
2018-06-04 Merge branch 'bw/refspec-api'
2018-06-04 Merge branch 'tg/doc-sec-list'
2018-06-04 Merge branch 'rd/p4-doc-markup-env'
2018-06-04 Merge branch 'nd/remote-update-doc'
2018-06-04 Merge branch 'jt/submodule-pull-recurse-rebase'
2018-06-01 Merge branch 'bw/ref-prefix-for-configured-refspec'
2018-06-01 Merge branch 'cc/tests-without-assuming-ref-files-backend'
2018-06-01 Merge branch 'rd/init-typo'
2018-06-01 Merge branch 'js/rebase-recreate-merge'
2018-06-01 Merge branch 'rd/tag-doc-lightweight'
2018-06-01 Merge branch 'rd/doc-options-placeholder'
2018-06-01 Merge branch 'en/rev-parse-invalid-range'
2018-06-01 Merge branch 'ld/p4-unshelve'
2018-06-01 Merge branch 'nd/use-opt-int-set-f'
2018-06-01 Merge branch 'pa/import-tars-long-names'
2018-06-01 Merge branch 'nd/command-list'
2018-05-31 Merge remote-tracking branch 'git-po/maint'
2018-05-30 Merge branch 'bw/remote-curl-compressed-responses'
2018-05-30 Merge branch 'ma/unpack-trees-free-msgs'
2018-05-30 Merge branch 'bc/hash-independent-tests'
2018-05-14 t: switch $_z40 to $ZERO_OID
2018-03-06 Merge branch 'cb/ttk-style' of git-gui into cb/git...
2018-03-02 Merge branch 'bb/ssh-key-files' of git-gui into bb...
2018-03-02 Merge branch 'bp/bind-kp-enter' of git-gui into bp...
2018-01-09 Merge branch 'js/misc-git-gui-stuff' of ../git-gui
2017-12-05 Merge branch 'ls/no-double-utf8-author-name' of .....
2017-11-22 Merge branch 'jn/reproducible-build' of ../git-gui...
2017-11-09 Merge branch 'tz/fsf-address-update' of ../git-gui...
2017-10-28 Merge branch 'sg/rev-list-doc-reorder-fix'
2017-07-25 Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-06-05 Merge branch 'sg/core-filemode-doc-typofix' into maint
2017-05-29 Merge branch 'sg/core-filemode-doc-typofix'
2017-05-01 Merge branch 'jk/prio-queue-avoid-swap-with-self'
2017-04-17 Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-03-30 Merge branch 'bc/push-cert-receive-fix'
2017-03-30 Merge branch 'jc/merge-drop-old-syntax'
2017-03-21 Merge branch 'jk/ewah-use-right-type-in-sizeof' into...
2017-03-13 Merge branch 'jk/ewah-use-right-type-in-sizeof'
2017-02-24 Merge branch 'bc/worktree-doc-fix-detached'
2017-01-18 Merge git://ozlabs.org/~paulus/gitk
2017-01-17 Merge branch 'sb/t3600-cleanup' into maint
2017-01-17 Merge branch 'bb/unicode-9.0' into maint
2016-12-19 Merge branch 'sb/t3600-cleanup'
2016-12-19 Merge branch 'bb/unicode-9.0'
2016-10-20 Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-09-29 Merge branch 'mr/vcs-svn-printf-ulong' into maint
2016-09-26 Merge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26 Merge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-21 Merge branch 'mr/vcs-svn-printf-ulong'
2016-09-11 Merge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09 Merge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07 Merge branch 'sy/i18n' of git-gui
2016-08-31 Merge branch 'ls/packet-line-protocol-doc-fix'
2016-08-03 Merge branch 'jk/git-jump'
2016-07-28 Merge branch 'js/t3404-grammo-fix' into maint
2016-07-13 Merge branch 'js/t3404-grammo-fix'
2016-07-11 Merge branch 'cb/t7810-test-label-fix' into maint
2016-07-06 Merge branch 'cb/t7810-test-label-fix'
2016-07-06 Merge branch 'ap/git-svn-propset-doc' into maint
2016-06-27 Merge branch 'ap/git-svn-propset-doc'
2016-06-03 Merge branch 'pa/cherry-pick-doc-typo'
2016-05-30 Merge branch 'rj/log-decorate-auto'
2016-05-26 Merge branch 'va/mailinfo-doc-typofix' into maint
2016-05-23 Merge branch 'jc/rerere-multi'
2016-05-18 Merge branch 'rn/glossary-typofix' into HEAD
2016-05-17 Merge branch 'va/mailinfo-doc-typofix'
2016-05-17 Merge branch 'jc/ll-merge-internal'
2016-05-10 Merge branch 'rn/glossary-typofix'
2016-05-02 Merge branch 'ad/cygwin-wants-rename' into maint
2016-04-25 Merge branch 'jc/rerere-multi'
2016-04-22 Merge branch 'ad/cygwin-wants-rename'
2016-04-03 Merge branch 'jc/maint-index-pack-keep'
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-14 Merge branch 'mg/wt-status-mismarked-i18n'
2016-03-03 Merge branch 'jc/maint-index-pack-keep' into jc/index...
2016-02-22 Merge branch 'js/git-remote-add-url-insteadof-test'
2016-02-22 Merge branch 'jk/config-include'
2016-02-17 Merge branch 'jk/rerere-xsnprintf'
2016-02-05 Merge branch 'ss/clone-depth-single-doc' into maint
2016-02-05 Merge branch 'sg/t6050-failing-editor-test-fix' into...
2016-02-05 Merge branch 'ew/for-each-ref-doc' into maint
2016-02-05 Merge branch 'ss/user-manual' into maint
2016-02-05 Merge branch 'jk/sanity' into maint
2016-02-05 Merge branch 'nd/exclusion-regression-fix' into maint
2016-02-05 Merge branch 'nd/dir-exclude-cleanup' into maint
2016-02-05 Merge branch 'nd/stop-setenv-work-tree' into maint
2016-01-29 Merge branch 'jk/sanity'
next