Merge branch 'jn/apply-filename-with-sp'
[gitweb.git] / t / t6038-merge-text-auto.sh
2010-09-03 Merge branch 'jn/apply-filename-with-sp'
2010-09-03 Merge branch 'jn/merge-custom-no-trivial'
2010-09-03 Merge branch 'jc/maint-doc-em-dash'
2010-09-03 Merge branch 'mg/doc-bundle'
2010-09-03 Merge branch 'jn/doc-backslash'
2010-09-03 Merge branch 'jn/update-contrib-example-merge'
2010-09-03 Merge branch 'jn/merge-renormalize'
2010-08-06 t6038 (merge.renormalize): check that it can be turned off
2010-08-06 t6038 (merge.renormalize): try checkout -m and cherry...
2010-08-06 t6038 (merge.renormalize): style nitpicks
2010-07-02 Try normalizing files to avoid delete/modify conflicts...
2010-07-02 Avoid conflicts when merging branches with mixed normal...