##// END OF EJS Templates
branching: merge stable into default
branching: merge stable into default

File last commit:

r50516:55c6ebd1 stable
r50522:7577b864 merge default
Show More
test-issue612.t
35 lines | 634 B | text/troff | Tads3Lexer
https://bz.mercurial-scm.org/612
$ hg init repo
$ cd repo
$ mkdir src
$ echo a > src/a.c
$ hg ci -Ama
adding src/a.c
$ hg mv src source
moving src/a.c to source/a.c
$ hg ci -Ammove
$ hg co -C 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo new > src/a.c
$ echo compiled > src/a.o
$ hg ci -mupdate
created new head
$ hg status
? src/a.o
$ hg merge
merging src/a.c and source/a.c to source/a.c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg status
M source/a.c
R src/a.c
? src/a.o