[Bps-public-commit] r12530 - in Prophet/branches/moose: .

[sartak at bestpractical.com]

Author: sartak
Date: Mon May 19 09:47:21 2008
New Revision: 12530

Modified:
   Prophet/branches/moose/   (props changed)
   Prophet/branches/moose/lib/Prophet/CLI.pm

Log:
 r56350 at onn:  sartak | 2008-05-19 09:42:27 -0400
 Give some kind of output in the merge command


Modified: Prophet/branches/moose/lib/Prophet/CLI.pm
==============================================================================
--- Prophet/branches/moose/lib/Prophet/CLI.pm	(original)
+++ Prophet/branches/moose/lib/Prophet/CLI.pm	Mon May 19 09:47:21 2008
@@ -523,6 +523,8 @@
     $target->import_resolutions_from_remote_replica( from => $source );
 
     $self->_do_merge( $source, $target );
+
+    print "Merge complete.\n";
 }
 
 sub _do_merge {