Merge branch 'jc/maint-add-u-remove-conflicted'
[gitweb.git] / Documentation / merge-config.txt
2008-05-03 Merge commit 'sg/merge-options^' into jk/renamelimit
2008-04-13 fmt-merge-msg: add '--(no-)log' options and 'merge...
2008-04-13 add 'merge.stat' config variable
2008-04-13 doc: moved merge.* config variables into separate merge...