Re: [O] Make errors from a fresh git clone

[Jarmo Hurri]

Achim Gratz <address@hidden> writes:

> Jarmo Hurri writes:
>> Any ideas of what might be going wrong?
>
> Bastien committed a merge conflict in org-agenda.  I've pushed up a
> fix, but it should probably be reviewed again.

Ok, it compiles now. Thanks!

I thought the decription "fresh git clone" would specify where I was:
master and latest revision.

sh-4.2$ git status
# On branch master
nothing to commit (working directory clean)
sh-4.2$ git describe
release_7.9.1-314-g998e556
sh-4.2$ git log -2
commit 998e5565c4043702a5f583236b0db22bd526dcb4
Author: Achim Gratz <address@hidden>
Date:   Sun Sep 23 16:27:25 2012 +0200

    Fix merge conflict in org-agenda.el
    
    * lisp/org-agenda.el: Merge conflict due to additional parameters in
      both maint and master resolved.
    
    Needs review!

commit ed991f49d7f5d27664ff09ae19e6b7e9690edbfb
Merge: a14948c 5a29711
Author: Bastien Guerry <address@hidden>
Date:   Sun Sep 23 12:01:05 2012 +0200

    Merge branch 'maint'

--

Jarmo