Mercurial > jhg
comparison src/org/tmatesoft/hg/core/HgIncomingCommand.java @ 341:75c452fdd76a
Merging state not detected when there's no conflicts to resolve (no merge/state file)
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Thu, 17 Nov 2011 07:04:58 +0100 |
| parents | d68dcb3b5f49 |
| children | 189dc6dc1c3e |
comparison
equal
deleted
inserted
replaced
| 340:a54bfe0db959 | 341:75c452fdd76a |
|---|