=> git-1.6.3.2-1.fc12.src.rpm => git-1.6.3.2-1.fc12.i586 in rawhide-development-i386 File conflict with: git-cola-1.3.6-1.fc11.noarch /usr/share/man/man1/git-difftool.1.gz
I'll take care of this in git-cola. *** This bug has been marked as a duplicate of bug 506147 ***