[Monotone-devel] nvm.resolve_conflicts strangeness

[Lapo Luchini]

1. `mtn show_conflicts r1 r2` shows 7 conflicting files
2. `mtn store r1 r2` shows (the same) 7 conflicts
3. `mtn conflicts show_remaining` shows 3.. three??

I didn't resolve anything so far... what is happening?
Either I didn't understand the meaning of command number 3, or something
strange is happening =)

Details:

r1 = 080ee093eb6d7c90888796128f50957659e79361
r2 = 300cd7582933605def54232219c2c2634678c5b5

conflicts 1 & 2:
Makefile.am
database.cc
vocab.hh
work.cc
netsync.cc
cmd_netsync.cc
options_list.hh

conflicts 3:
Makefile.am
netsync.cc
cmd_netsync.cc

-- 
Lapo Luchini - http://lapo.it/

“We are not an endangered species ourselves yet, but this is not for
lack of trying.” (Douglas Adams, "Last Chance to See", 1991)