Do a better job at guessing unknown character sets
[gitweb.git] / git-mergetool.sh
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...