Mercurial > hg4j
diff src/org/tmatesoft/hg/core/HgMergeCommand.java @ 706:cd5c87d96315
Merge: tests for mediator notifications
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Fri, 16 Aug 2013 14:54:09 +0200 |
| parents | b4242b7e7dfe |
| children | 42b88709e41d |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/core/HgMergeCommand.java Thu Aug 15 18:43:50 2013 +0200 +++ b/src/org/tmatesoft/hg/core/HgMergeCommand.java Fri Aug 16 14:54:09 2013 +0200 @@ -362,9 +362,7 @@ } else { dirstateBuilder.recordMerged(file, fw.fmode(), fw.mtime(), fw.bytesWritten()); } - } else { - assert false; - } + } // else no resolution was chosen, fine with that } public void use(HgFileRevision rev) {