No Description

Andrew Young 0e3de4ad30 Ignore the created executables and libraries 8 years ago
config 91b758c5eb Add prototype docs and tests 8 years ago
doc 0e3de4ad30 Ignore the created executables and libraries 8 years ago
lib f4d8c5fd15 Update .gitignore and autotoll files 8 years ago
m4 f4d8c5fd15 Update .gitignore and autotoll files 8 years ago
src 93dbb78745 Fix the lexer identification of uid's in properties. 8 years ago
tests 2580be7581 Add more tests 8 years ago
.gitignore 0e3de4ad30 Ignore the created executables and libraries 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 f4d8c5fd15 Update .gitignore and autotoll files 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 b7bbb7917f make org_lexer.l reentrant 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.