Add a test for rebase when a change was picked upstream
[git] / t / t6021-merge-criss-cross.sh
2005-12-07  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-12-04  Junio C HamanoGIT 0.99.9l aka 1.0rc4 v0.99.9l v1.0rc4
2005-12-03  Fredrik KuivinenNew test case: Criss-cross merge