I have been loosing code due to poor merging built in to Android Studio (using SVN for source control) how can I configure kDiff3 as the merge tool which Android Studio will use for diff and merge.
Turns out this is simple like in Visual Studio or Eclipse.
File > Settings... > Tools > Diff > External Diff Tools