KDiff3
From Hash, Inc. WIKI
KDiff3 is a diff/merge tool that takes a text file that two people started from and their changes and merges each persons changes into one file. Usefull for resolving svn conflicts on osx.
| Hash, Inc. WIKI | Main Page | About | Help | FAQ | Special pages | Log in |
Categories: TWO | SVN Printable version | Disclaimers | Privacy policy |