diff src/org/tmatesoft/hg/core/HgCallbackTargetException.java @ 557:b9e5ac26dd83

Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Sun, 24 Feb 2013 00:11:40 +0100
parents 31a89587eb04
children
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/core/HgCallbackTargetException.java	Fri Feb 22 20:21:24 2013 +0100
+++ b/src/org/tmatesoft/hg/core/HgCallbackTargetException.java	Sun Feb 24 00:11:40 2013 +0100
@@ -32,8 +32,8 @@
  * <p>It's intentionally not a subclass of {@link HgException} to avoid get mixed with library own errors and be processed separately.
  * 
  * <p>Top-level API handlers ({@link HgStatusHandler}, {@link HgManifestHandler}, {@link HgChangesetHandler}, etc) allow to throw 
- * HgCallbackTargetException from their methods. Exceptions throws this way are not handled in corresponding commands, except for
- * revision or file name specification, unless already set. The, these exceptions go straight to the command caller.
+ * HgCallbackTargetException from their methods. Exceptions thrown this way are not handled in corresponding commands, except for
+ * revision or file name specification, unless already set. Then, these exceptions go straight to the command caller.
  * 
  * @author Artem Tikhomirov
  * @author TMate Software Ltd.