No Description

Andrew Young 131d4ca24c Update todo and implementation notes 8 years ago
config 91b758c5eb Add prototype docs and tests 8 years ago
doc 131d4ca24c Update todo and implementation notes 8 years ago
gnulib a99b941121 Add new Gnulib .gitignore 8 years ago
m4 d47506a6ae Modify gnulib directories. 8 years ago
src a8b7289524 Update the makefile and main 8 years ago
tests 56c2de3270 Update and add unit tests 8 years ago
.gitignore 6de02c7e92 Remove the parser from .gitignore 8 years ago
AUTHORS 91b758c5eb Add prototype docs and tests 8 years ago
COPYING 91b758c5eb Add prototype docs and tests 8 years ago
ChangeLog 91b758c5eb Add prototype docs and tests 8 years ago
Doxyfile 7cbcb0114a Add doxygen config file 8 years ago
INSTALL 91b758c5eb Add prototype docs and tests 8 years ago
Makefile.am f947629f12 Change the order project directories are built in 8 years ago
NEWS 91b758c5eb Add prototype docs and tests 8 years ago
README 91b758c5eb Add prototype docs and tests 8 years ago
configure.ac d47506a6ae Modify gnulib directories. 8 years ago

README

This is Org Merge Driver, a program for merging changes to Org mode files.

This project is currently being developed under Google Summer of Code
2012 for the Gnu organization.

The project page can be found at
http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/index.html

The homepage of Org is at http://orgmode.org.