(view as text)
git merge prime/develop
 in dir /home/libcellml/buildslave/Unit_Tests_Builder_Ubuntu_14_04_64_Bit/libcellml (timeout 1200 secs)
 watching logfiles {}
 argv: ['git', 'merge', 'prime/develop']
 environment:
  HOME=/home/libcellml
  LANG=en_NZ.UTF-8
  LOGNAME=libcellml
  MAIL=/var/mail/libcellml
  PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
  PWD=/home/libcellml/buildslave/Unit_Tests_Builder_Ubuntu_14_04_64_Bit/libcellml
  QT_QPA_PLATFORMTHEME=appmenu-qt5
  SHELL=/bin/sh
  TERM=linux
  USER=libcellml
  XDG_RUNTIME_DIR=/run/user/1005
  XDG_SESSION_ID=c3
 using PTY: False
Merge made by the 'recursive' strategy.
 src/xmldoc.cpp               |  2 ++
 tests/parser/libxml_user.cpp | 63 ++++++++++++++++++++++++++++++++++++++++++++
 tests/parser/tests.cmake     |  1 +
 3 files changed, 66 insertions(+)
 create mode 100644 tests/parser/libxml_user.cpp
program finished with exit code 0
elapsedTime=0.104576