Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4
[gitweb.git] / Documentation / technical / api-merge.txt
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-26 ll-merge: replace flag argument with options struct
2010-08-06 ll-merge: make flag easier to populate
2010-08-06 Documentation/technical: document ll_merge