diff cmdline/org/tmatesoft/hg/console/Merge.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
line wrap: on
line diff
--- a/cmdline/org/tmatesoft/hg/console/Merge.java	Thu Aug 15 18:43:50 2013 +0200
+++ b/cmdline/org/tmatesoft/hg/console/Merge.java	Fri Aug 16 14:54:09 2013 +0200
@@ -57,12 +57,11 @@
 	static class Dump implements HgMergeCommand.Mediator {
 
 		public void same(HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException {
-			System.out.printf("Unchanged %s:%s", rev.getPath(), rev.getRevision().shortNotation());
+			System.out.printf("Unchanged %s:%s\n", rev.getPath(), rev.getRevision().shortNotation());
 		}
 
 		public void onlyA(HgFileRevision base, HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException {
-			System.out.printf("Left in first trunk only %s:%s", rev.getPath(), rev.getRevision().shortNotation());
-			
+			System.out.printf("Left in first trunk only %s:%s\n", rev.getPath(), rev.getRevision().shortNotation());
 		}
 
 		public void onlyB(HgFileRevision base, HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException {