paperlined.org
dev
>
tools
>
revision_control
document updated 13 years ago, on Jan 8, 2011
Tools that can do three-way merges:
Meld
diff3