(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
Auto-merging CMakeLists.txt
Merge made by the 'recursive' strategy.
 CMakeLists.txt                  |  6 ++++
 cmake/cmake_uninstall.cmake.in  | 36 +++++++++++++++++++++++
 src/parser.cpp                  |  2 +-
 src/xmldoc.cpp                  |  2 ++
 tests/parser/file_parser.cpp    | 22 ++++++++++++++
 tests/parser/libxml_user.cpp    | 63 +++++++++++++++++++++++++++++++++++++++++
 tests/parser/tests.cmake        |  1 +
 tests/resources/a_plus_b.cellml | 45 +++++++++++++++++++++++++++++
 tests/test_resources.cmake      |  1 +
 tests/test_resources.h.in       |  7 ++++-
 10 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 cmake/cmake_uninstall.cmake.in
 create mode 100644 tests/parser/libxml_user.cpp
 create mode 100644 tests/resources/a_plus_b.cellml
program finished with exit code 0
elapsedTime=0.092442