merge script: refuse to merge during merge
[gitweb.git] / contrib / gitview / gitview.txt
2006-02-18 Merge branch 'jc/pack-reuse'
2006-02-18 Merge branch 'js/portable'
2006-02-17 Add a README for gitview