merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / git-web--browse.sh
2008-02-05 Rename 'git-help--browse.sh' to 'git-web--browse.sh'.