tim added conflict resolutions to cache

Host: gil
Repository: /home/tim/vc/rerere-test/.git/rr-cache