##// END OF EJS Templates
Merge with stable
Merge with stable

File last commit:

r6512:368a4ec6 default
r10093:a43ae577 merge default
Show More
test-issue612.out
11 lines | 329 B | text/plain | TextLexer
adding src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
? src/a.o
merging src/a.c and source/a.c to source/a.c
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M source/a.c
R src/a.c
? source/a.o