xdl_merge(): fix and simplify conflict handling
[git] / t / annotate-tests.sh
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk
2006-11-24  Junio C HamanoMerge branch 'jc/upload-pack'
2006-11-13  Junio C HamanoMerge branch 'maint'
2006-11-12  Junio C HamanoMerge branch 'maint'
2006-11-11  Junio C HamanoMerge branch 'maint'
2006-11-09  Junio C HamanoMerge branch 'maint'
2006-11-09  Junio C HamanoMerge branch 'maint'
2006-11-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-11-08  Junio C HamanoMerge branch 'maint'
2006-11-08  Junio C HamanoMerge branch 'jc/pickaxe'
2006-10-20  Junio C Hamanogit-pickaxe: blame rewritten.
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-13  Junio C HamanoMerge branch 'jc/upload-pack'
2006-08-13  Junio C HamanoMerge branch 'th/diff-extra'
2006-08-13  Junio C HamanoMerge branch 'jc/pack-objects'
2006-08-13  Junio C HamanoMerge branch 'js/read-tree'
2006-08-13  Junio C HamanoMerge branch 'jn/web'
2006-08-13  Junio C HamanoMerge branch 'lt/web'
2006-08-13  Junio C HamanoMerge branch 'ml/pager'
2006-08-13  Junio C HamanoMerge branch 'master' into js/c-merge-recursive
2006-08-13  Junio C HamanoGIT 1.4.2 v1.4.2
2006-08-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-08  Junio C HamanoMerge branch 'master' into pb/gitpm
2006-08-03  Junio C HamanoMerge branch 'jc/sideband'
2006-08-02  Ramsay Allan JonesFix annotate test script; notice when git-annotate...
2006-07-30  Junio C HamanoMerge branch 'jn/make'
2006-07-26  Junio C HamanoMerge branch 'pb/configure'
2006-07-13  Junio C HamanoMerge branch 'ml/trace'
2006-07-13  Junio C HamanoMerge branch 'js/merge-base'
2006-07-13  Junio C HamanoMerge branch 'lt/prune'
2006-07-13  Junio C HamanoMerge branch 'lt/merge-tree'
2006-07-11  Eric Wongtests: Set EDITOR=: and VISUAL=: globally
2006-06-22  Junio C HamanoMerge branch 'js/lsfix'
2006-06-22  Junio C HamanoMerge branch 'jn/web'
2006-06-22  Junio C HamanoMerge early parts of branch 'js/diff'
2006-06-22  Junio C HamanoMerge branch 'jn/web' into next
2006-06-22  Junio C HamanoMerge branch 'ff/c99'
2006-06-22  Junio C HamanoMerge branch 'pb/config'
2006-06-21  Junio C HamanoMerge branch 'jn/web' into next
2006-06-21  Junio C HamanoMerge branch 'ff/c99' into next
2006-06-21  Junio C HamanoMerge branch 'jn/web' into next
2006-06-20  Junio C HamanoMerge branch 'jn/web' into next
2006-06-20  Junio C HamanoMerge branch 'jn/web' into next
2006-06-20  Junio C HamanoMerge branch 'jn/web' into next
2006-06-20  Junio C HamanoMerge branch 'pb/config' into next
2006-06-20  Junio C HamanoMerge branch 'lt/objlist' into next
2006-06-20  Dennis StosbergFix t8001-annotate and t8002-blame for ActiveState...
2006-06-19  Junio C HamanoMerge branch 'pb/config' into next
2006-06-19  Junio C HamanoMerge branch 'yl/build'
2006-06-19  Junio C HamanoMerge branch 'jc/shared'
2006-06-19  Junio C HamanoMerge branch 'eb/mail'
2006-06-18  Dennis StosbergMake t8001-annotate and t8002-blame more portable
2006-06-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10  Junio C HamanoMerge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04  Junio C HamanoMerge branch 'new' of git://git./gitk/gitk into next
2006-06-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-03  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07  Junio C HamanoMerge branch 'maint'
2006-04-05  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05  Junio C HamanoMerge branch 'fix'
2006-04-04  Junio C HamanoMerge branch 'lt/fix-sol-pack'
2006-04-04  Junio C HamanoMerge branch 'lt/fix-sol-pack' into next
2006-04-02  Junio C HamanoMerge branch 'lt/fix-sol-pack' into next
2006-03-31  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-26  Junio C HamanoMerge branches 'jc/clone' and 'jc/name'
2006-03-26  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-22  Junio C HamanoMerge branch 'jc/clone' into next
2006-03-21  Junio C HamanoMerge branch 'jc/clone' into next
2006-03-21  Junio C HamanoMerge branch 'jc/clone' into next
2006-03-20  Junio C HamanoMerge branch 'jc/clone' into next
2006-03-15  Junio C HamanoMerge branch 'lt/diff' into next
2006-03-15  Junio C HamanoMerge branch 'lt/diff' into next
2006-03-13  Junio C HamanoMerge branch 'jc/pack'
2006-03-13  Junio C HamanoMerge branch 'jc/fsck'
2006-03-13  Junio C HamanoMerge branch 'nh/http'
2006-03-13  Junio C HamanoMerge branch 'fk/blame'
2006-03-13  Junio C HamanoMerge branch 'jc/diff' into next
2006-03-13  Junio C HamanoMerge branch 'jc/diff' into next
2006-03-13  Junio C HamanoMerge branch 'jc/diff' into next
2006-03-12  Junio C HamanoMerge branch 'jc/empty' into next
2006-03-12  Mark Woodingannotate-tests: override VISUAL when running tests.
2006-03-12  Junio C HamanoMerge branch 'jc/diff' into next
2006-03-07  Junio C HamanoMerge branch 'sp/checkout'
2006-03-07  Junio C HamanoMerge branch 'jc/pack' into next
2006-03-07  Junio C HamanoMerge branch 'fd/asciidoc'
2006-03-06  Junio C HamanoMerge branch 'master' into next
2006-03-06  Junio C Hamanoannotate-blame: tests incomplete lines.
2006-03-06  Junio C HamanoMerge branch 'fd/asciidoc' into next
2006-03-06  Junio C Hamanoannotate-blame test: add evil merge.
2006-03-06  Junio C Hamanoannotate/blame tests updates.
2006-03-06  Fredrik Kuivinengit-blame: Use the same tests for git-blame as for...