merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / Documentation / git-tools.txt
2006-03-04 Merge branch 'lt/rev-list' into next
2006-03-04 Merge branch 'jc/diff' into next
2006-03-04 Add a Documentation/git-tools.txt