Andrew Young d19a3ff027 Properly return -1 on unresolved conflict 8 years ago
..
Makefile.am ce8dc52f2a Add context sources to makefile 8 years ago
debug.h a610b74f0f Disable debug printing 8 years ago
doc_elt.h c10786c46d Write new contexts and interfaces 8 years ago
doc_elt_ops.h c10786c46d Write new contexts and interfaces 8 years ago
doc_elt_util.h 250c695502 Add functions to verify todos and priorities 8 years ago
doc_ref.c d247aadd55 Implement beginning of cycle testing 8 years ago
doc_ref.h d247aadd55 Implement beginning of cycle testing 8 years ago
doc_stream.h 6f721c5b33 Implement fwrite docstream wrapper 8 years ago
main.c d19a3ff027 Properly return -1 on unresolved conflict 8 years ago
merge_ctxt.c c10786c46d Write new contexts and interfaces 8 years ago
merge_ctxt.h c10786c46d Write new contexts and interfaces 8 years ago
org_document.c d367832ff0 Implement new doc_elt interfaces 8 years ago
org_document.h d367832ff0 Implement new doc_elt interfaces 8 years ago
org_heading.c 6982e506c3 Implement new isrelated and print strategies. 8 years ago
org_heading.h 6982e506c3 Implement new isrelated and print strategies. 8 years ago
org_lexer.l 564284e753 Implement parsing of properties properties drawer 8 years ago
org_parser.c 564284e753 Implement parsing of properties properties drawer 8 years ago
org_parser.h 564284e753 Implement parsing of properties properties drawer 8 years ago
org_property.c 31b4e25a78 Implement org_property document element 8 years ago
org_property.h 31b4e25a78 Implement org_property document element 8 years ago
org_text.c fe44d5a44e Implement merging of text using string_merge 8 years ago
org_text.h 783f09663d Update org_text to use the new interfaces 8 years ago
parse_ctxt.c c10786c46d Write new contexts and interfaces 8 years ago
parse_ctxt.h c10786c46d Write new contexts and interfaces 8 years ago
print.c d19a3ff027 Properly return -1 on unresolved conflict 8 years ago
print.h 9a53ce922f Move out print_ctxt to it's own source 8 years ago
print_ctxt.c d19a3ff027 Properly return -1 on unresolved conflict 8 years ago
print_ctxt.h d19a3ff027 Properly return -1 on unresolved conflict 8 years ago
smerger.c bae3e9cddd Fix issue with incorrect doc_elt_keys 8 years ago
smerger.h bae3e9cddd Fix issue with incorrect doc_elt_keys 8 years ago
string_merge.c 2a73a067c2 Implement a line-by-line string merge algorithm 8 years ago
string_merge.h 2a73a067c2 Implement a line-by-line string merge algorithm 8 years ago