git-svn: add support for --first-parent
[gitweb.git] / Documentation / git-mergetool.txt
2007-03-14 Merge branch 'pb/branch-track'
2007-03-14 Merge branch 'master' of git://repo.or.cz/git/mergetool
2007-03-14 Add git-mergetool to run an appropriate merge conflict...