checkout -m --conflict=diff3: add a label for ancestor
[gitweb.git] / t / t4024-diff-optimize-common.sh
2008-01-08 Merge in GIT 1.5.3.8
2008-01-05 Merge git://repo.or.cz/git-gui
2007-12-31 Merge branch 'maint' of git://linux-nfs.org/~bfields/git
2007-12-20 t4024: fix test script to use simpler sed pattern
2007-12-18 Merge branch 'maint'
2007-12-16 Re-re-re-fix common tail optimization