SaltyCrane Blog — Notes on JavaScript and web development

Using kdiff3 with svn merge

Date: 2010-02-04 | Tags: notestoself, subversion | 1 Comment

http://www.dronecode.org.uk/daybook/2008/10/graphical-merge-for-subversion.html

Reference documentation

Using External Differencing and Merge Tools
Resolve Conflicts (Merging Others' Changes)
Config file

Comments

#1 a commented on 2014-03-12:

hi