Hello, Qiang Fang <godbles...@gmail.com> writes:
> Hello Nicolas, > The complete diff is: > > $ ~/src$ git clone https://code.orgmode.org/bzg/org-mode.git > $ cd org-mode > $ git merge origin/wip-cite > > Auto-merging testing/lisp/test-org-element.el > Auto-merging lisp/org-element.el > CONFLICT (content): Merge conflict in lisp/org-element.el > Automatic merge failed; fix conflicts and then commit the result. As I said, I merged "wip-cite" with master two days ago, fixing merge conflicts along the way. The command above poses no problem here. Regards, -- Nicolas Goaziou
