From e46ed34390659aadcc0d322bdfa56bc2934d0ac8 Mon Sep 17 00:00:00 2001
From: fukachan <fukachan>
Date: Thu, 30 Dec 2004 04:35:48 +0000
Subject: cosmetic changes: $VARIABLE format, "\n".

---
 fml/lib/FML/Merge.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fml/lib/FML/Merge.pm b/fml/lib/FML/Merge.pm
index c065069d..737b04f5 100644
--- a/fml/lib/FML/Merge.pm
+++ b/fml/lib/FML/Merge.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Merge.pm,v 1.15 2004/12/09 03:35:36 fukachan Exp $
+# $FML: Merge.pm,v 1.16 2004/12/29 08:21:50 fukachan Exp $
 #
 
 package FML::Merge;
@@ -416,11 +416,14 @@ sub _inject_diff_into_config_cf
 	$v = $diff->{ $k };
 	$y = $v;
 	$y =~ s/\n/\n# /gm;
-	print $wh "# $k => $y\n";
+	print $wh "# \$$k => $y\n";
 
 	if ($x = $config_ph->translate($diff, $k, $v)) {
 	    print $wh $x ,"\n\n";
 	}
+	else {
+	    print $wh "\n";
+	}
     }
 
     print $wh "\n";
-- 
cgit v1.2.1