merge-recursive: don't segfault while handling rename clashes
[gitweb.git] / git-gui / lib / encoding.tcl
2007-07-30 Merge branch 'bs/lock'
2007-07-30 Merge branch 'master' of git://repo.or.cz/git-gui