all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [GSoC] org-merge-driver weekly update
@ 2012-05-30 14:36 Andrew Young
  2012-05-30 17:15 ` Carsten Dominik
  0 siblings, 1 reply; 10+ messages in thread
From: Andrew Young @ 2012-05-30 14:36 UTC (permalink / raw)
  To: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 370 bytes --]

Hello everyone,

I would just like to let everyone know that a prototype for
org-merge-driver is available.  It is not complete, so of course please do
not use it for your repository! ;)

You can see some example use of it at the the worg project page:
http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/prototype.html

Sincerely,
Andrew Young

[-- Attachment #2: Type: text/html, Size: 574 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread
* [GSoC] org-merge-driver weekly update
@ 2012-06-17  2:15 Andrew Young
  0 siblings, 0 replies; 10+ messages in thread
From: Andrew Young @ 2012-06-17  2:15 UTC (permalink / raw)
  To: emacs-orgmode

Hi everyone,
small weekly update;

I'm almost finished creating the parser.  Because of the nature
of org mode grammar, the files are being parsed with regexs and
(f)lex.

Because Orgmode files can be written in any character encoding
supported in Emacs, I am looking into using libiconv to support
as many file encodings as possible.

Sincerely,
Andrew Young

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2012-06-17  2:15 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-30 14:36 [GSoC] org-merge-driver weekly update Andrew Young
2012-05-30 17:15 ` Carsten Dominik
2012-05-30 17:56   ` Bastien
2012-05-31  7:31   ` Andrew Young
2012-05-31  7:38     ` Carsten Dominik
2012-06-04 15:30       ` Robert Horn
2012-06-06 13:50         ` Andrew Young
2012-06-06 13:56           ` Carsten Dominik
2012-06-06 14:20             ` Robert Horn
  -- strict thread matches above, loose matches on Subject: below --
2012-06-17  2:15 Andrew Young

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.