[emfcompare-build] [Hudson] Build failed in Hudson: egit.logical-master-

[hudsonbuild@xxxxxxxxxxx]

See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/381/changes>

Changes:

[Matthias Sohn] Introduce a mergeStrategy extension point.

------------------------------------------
Started by an SCM change
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@56daa64
Using strategy: Default
Git Exe: git
Last Built Revision: Revision 3a6a38c067ef807fe3898367c891029cf3611e17 (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@56daa64
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision 99cdec0cd3cce94f4ceb69364c715dfa81ee0edb (origin/master)
Checking out Revision 99cdec0cd3cce94f4ceb69364c715dfa81ee0edb (origin/master)
Starting xvnc
[workspace] $ Xvnc :661 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson5099417699623592304.sh
+ metacity --replace --sm-disable
01/09/2015 00:02:01 Xvnc version X.org/xf4vnc custom version
01/09/2015 00:02:01 Copyright (C) 2001-2004 Alan Hourihane.
01/09/2015 00:02:01 Copyright (C) 2000-2004 Constantin Kaplinsky
01/09/2015 00:02:01 Copyright (C) 1999 AT&T Laboratories Cambridge
01/09/2015 00:02:01 All Rights Reserved.
01/09/2015 00:02:01 See http://www.tightvnc.com/ for information on TightVNC
01/09/2015 00:02:01 See http://xf4vnc.sf.net for xf4vnc-specific information
01/09/2015 00:02:01 Desktop name 'x11' (hipp6:661)
01/09/2015 00:02:01 Protocol versions supported: 3.7, 3.3
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson6596890062306423701.sh
01/09/2015 00:02:01 RGB format 8 8 8
01/09/2015 00:02:01 Listening for VNC connections on TCP port 6561
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22674'
>> Cherry-picking https://git.eclipse.org/r/#/c/22674
+ git fetch /gitroot/egit/egit refs/changes/74/22674/28
[dix] Could not init font path element /usr/share/fonts/TTF/, removing from list!
[dix] Could not init font path element /usr/share/fonts/OTF, removing from list!
(EE) config/hal: NewInputDeviceRequest failed (2)
(EE) config/hal: NewInputDeviceRequest failed (2)
>From /gitroot/egit/egit
 * branch            refs/changes/74/22674/28 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 12afd03... [wip] Use a workspace-aware merging strategy when working from EGit
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Terminating xvnc.
Recording test results
Archiving artifacts

--
This message is automatically generated by Hudson. 
For more information on Hudson, see: http://hudson-ci.org/