No Description

Andrew Young 20ce674080 Parser update 8 years ago
src 20ce674080 Parser update 8 years ago
tests 20ce674080 Parser update 8 years ago
.gitignore 47c6292da9 Add basic Gnu standard project layout 8 years ago
AUTHORS 47c6292da9 Add basic Gnu standard project layout 8 years ago
COPYING 47c6292da9 Add basic Gnu standard project layout 8 years ago
ChangeLog 47c6292da9 Add basic Gnu standard project layout 8 years ago
INSTALL 47c6292da9 Add basic Gnu standard project layout 8 years ago
Makefile.am 394dd80fef Generate org_lexer header file 8 years ago
NEWS 47c6292da9 Add basic Gnu standard project layout 8 years ago
README 488d4a921c README: Add project description and webpage 8 years ago
configure.ac 394dd80fef Generate org_lexer header file 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.