merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / git-gui / lib / encoding.tcl
2007-07-30 Merge branch 'master' of git://repo.or.cz/git-gui