Anonim / 9 years, 3 months ago | Download | Plaintext | Odpowiedz | 

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
$ bzr status
modified:
  semantics2/core/category.py
  semantics_cserver.py
  semserver/ccore/category.cpp
  semserver/ccore/category.h
  semserver/ccore/cifacemodule.cpp
  semserver/ccore/concept.cpp
  semserver/ccore/concept.h
  semserver/ccore/offer.cpp
  semserver/ccore/offer.h
  semserver/ccore/product.cpp
  semserver/ccore/product.h
  semserver/ccore/store.cpp
  semserver/ccore/store.h
  semserver/ccore/storesdir.cpp
  semserver/ccore/storesdir.h
  semserver/ccore/storesdir.py
  semserver/ccore/threads.h
  semserver/ccore/words_query.cpp
  semserver/ccore/words_query.h
  semserver/paths.py
unknown:
  semantics_cserver.py.BASE
  semantics_cserver.py.ok
conflicts:
  Conflict adding file semantics_cserver.py.BASE.  Moved existing file to semantics_cserver.py.BASE.moved.
  Conflict adding file semantics_cserver.py.OTHER.  Moved existing file to semantics_cserver.py.OTHER.moved.
  Conflict adding file semantics_cserver.py.THIS.  Moved existing file to semantics_cserver.py.THIS.moved.
  Conflict adding file semserver/ccore/category.cpp.BASE.  Moved existing file to semserver/ccore/category.cpp.BASE.moved.
  Conflict adding file semserver/ccore/category.cpp.OTHER.  Moved existing file to semserver/ccore/category.cpp.OTHER.moved.
  Conflict adding file semserver/ccore/category.cpp.THIS.  Moved existing file to semserver/ccore/category.cpp.THIS.moved.
  Conflict adding file semserver/ccore/store.cpp.BASE.  Moved existing file to semserver/ccore/store.cpp.BASE.moved.
  Conflict adding file semserver/ccore/store.cpp.OTHER.  Moved existing file to semserver/ccore/store.cpp.OTHER.moved.
  Conflict adding file semserver/ccore/store.cpp.THIS.  Moved existing file to semserver/ccore/store.cpp.THIS.moved.
pending merges:
<three merges>