bschaefer@bschaefer:unity$ bzr merge lp:~nick-dedekind/unity/lp1062107.preview-pre-caching
+N UnityCore/PreviewPreCacher.cpp
+N UnityCore/PreviewPreCacher.h
+N tests/test_previews_precacher.cpp
M UnityCore/CMakeLists.txt
M UnityCore/HomeLens.cpp
M UnityCore/HomeLens.h
M UnityCore/Lens.cpp
M UnityCore/Lens.h
M dash/DashView.cpp
M dash/LensView.cpp
M dash/LensView.h
M dash/previews/PreviewContainer.cpp
M dash/previews/SocialPreview.cpp
M dash/previews/SocialPreviewContent.cpp
M dash/previews/Track.cpp
M tests/CMakeLists.txt
M tests/test_lens.cpp
Text conflict in dash/LensView.cpp
Text conflict in dash/previews/Track.cpp
Text conflict in tests/CMakeLists.txt
3 conflicts encountered.
bschaefer@ bschaefer: unity$ bzr merge lp:~nick-dedekind/unity/lp1062107.preview-pre-caching PreviewPreCache r.cpp PreviewPreCache r.h previews_ precacher. cpp CMakeLists. txt HomeLens. cpp HomeLens. h PreviewContaine r.cpp SocialPreview. cpp SocialPreviewCo ntent.cpp Track.cpp s.txt Track.cpp s.txt
+N UnityCore/
+N UnityCore/
+N tests/test_
M UnityCore/
M UnityCore/
M UnityCore/
M UnityCore/Lens.cpp
M UnityCore/Lens.h
M dash/DashView.cpp
M dash/LensView.cpp
M dash/LensView.h
M dash/previews/
M dash/previews/
M dash/previews/
M dash/previews/
M tests/CMakeList
M tests/test_lens.cpp
Text conflict in dash/LensView.cpp
Text conflict in dash/previews/
Text conflict in tests/CMakeList
3 conflicts encountered.