Merge branch 'jk/maint-soliconv' into maint
[gitweb.git] / t / t6020-merge-df.sh
2006-02-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-12-04 GIT 0.99.9l aka 1.0rc4 v0.99.9lv1.0rc4
2005-12-03 New test case: merge with directory/file conflicts