Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/HgMergeState.java @ 705:b4242b7e7dfe
Merge command: implement conflict resolution alternatives
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Thu, 15 Aug 2013 18:43:50 +0200 |
| parents | 6526d8adbc0f |
| children | 42b88709e41d |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgMergeState.java Wed Aug 14 20:07:26 2013 +0200 +++ b/src/org/tmatesoft/hg/repo/HgMergeState.java Thu Aug 15 18:43:50 2013 +0200 @@ -218,7 +218,7 @@ /** * List of conflicts as recorded in the merge state information file. - * Note, this information is valid unless {@link #isStale()} is <code>true</code>. + * Note, this information is not valid unless {@link #isStale()} is <code>true</code>. * * @return non-<code>null</code> list with both resolved and unresolved conflicts. */