checkout --conflict=diff3: add a label for ancestor
[gitweb.git] / t / t7111-reset-table.sh
2010-01-17 Merge branch 'jn/makefile'
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-17 Merge branch 'tc/clone-v-progress'
2010-01-17 Merge branch 'tc/smart-http-restrict'
2010-01-17 Merge branch 'jk/run-command-use-shell'
2010-01-17 Merge branch 'sr/gfi-options'
2010-01-17 Merge branch 'maint'
2010-01-17 Merge branch 'cc/reset-more'
2010-01-16 t7111: fix bad HEAD in tests with unmerged entries
2010-01-13 Merge branch 'jc/checkout-merge-base'
2010-01-13 Merge branch 'rs/maint-archive-match-pathspec'
2010-01-13 Merge branch 'il/vcs-helper'
2010-01-13 Merge branch 'cc/reset-more'
2010-01-10 t7111: check that reset options work as described in...