Conflict Manager is a Windows Application which displays the original and conflicted file and allows you to choose which one to keep. It also features
- Line diff of text files
- Viewing of images and HTML pages
Conflict Manager is a Windows Application which displays the original and conflicted file and allows you to choose which one to keep. It also features
DropboxAddons/ConflictManager (last edited 2009-03-16 16:59:00 by )