[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (c6c717d7df365dbc0e2e5b147df216b15a6d4691)

Jaka Kranjc scm at sourcemage.org
Sat Aug 11 16:27:18 EDT 2007


GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 ChangeLog                            |    1 +
 var/lib/sorcery/modules/libresurrect |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c6c717d7df365dbc0e2e5b147df216b15a6d4691
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    libressurect: show unified diffs in real_handle_changed_config #13830

diff --git a/ChangeLog b/ChangeLog
index 8935fe2..039b3b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 	  added --logs to the man page
 	* gaze: fixed gaze newer breaking on bad input #10149
 	* libmisc: fix set_architecture not resetting the text color #13842
+	* libressurect: show unified diffs in real_handle_changed_config #13830
 
 2007-08-10 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* etc/sorcery/url: added default value for PERL_CPAN_URL #13673
diff --git a/var/lib/sorcery/modules/libresurrect b/var/lib/sorcery/modules/libresurrect
index b74a6d1..c93c4a9 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -547,7 +547,7 @@ function real_handle_changed_config() {
       3)  mark_file_modified "$to"
           touch "$to"
           break ;;
-      4)  diff "$to" "$from" | $PAGER;;
+      4)  diff -u "$to" "$from" | $PAGER;;
     esac
     message "\n\nPlease select another option"
   done



More information about the SM-Commit mailing list