Try normalizing files to avoid delete/modify conflicts when merging
[gitweb.git] / git-gui / windows /
2007-11-21 Merge git://repo.or.cz/git-gui