Merge Tool for Org-Mode

Table of Contents

A tool for for merging Org-Mode modifications

Git-Merge-Tool

About

Git-Merge-Tool is a specialised merge tool for Org-mode and Git. It will be developed during the GSoC 2012.

There is currently no release for this project. Please stay tuned as this project page will be updated when it becomes available.

Summary

Org-Merge-Driver is to create an extension to Org-Mode which will act as a merge driver for Org-Mode files. A merge driver is a program which will combine two versions of a file based off of a common ancestor into a single file, marking conflicting changes within. A specialized merge driver for Org-Mode leverages the file structure to understand the effects of modifications on the integrity of sections.

The main use of a merge driver is for use in collaborative writing. Org-merge-driver will be compatible with Git, Mercurial, and Bazaar. The merge driver will solidify Org-Mode as a tool for collaborative work.

Information

Version 0.1
Git Repo git clone git://orgmode.org/org-merge-driver.git
License GPL V3
Author Andrew Young
Supported Platforms N/A
Binaries N/A
Contact youngar17 at gmail dot com

More Information

Documentation from the http://orgmode.org/worg/ website (either in its HTML format or in its Org format) is licensed under the GNU Free Documentation License version 1.3 or later. The code examples and css stylesheets are licensed under the GNU General Public License v3 or later.