rendered paste body(chroot) livecd / # diff -uN /etc/etc-update.conf /etc/._cfg0000_etc-update.conf
--- /etc/etc-update.conf 2006-02-14 08:00:32.000000000 +0000
+++ /etc/._cfg0000_etc-update.conf 2006-08-09 21:32:43.000000000 +0000
@@ -21,12 +21,17 @@
pager="less"
#pager=""
+# For emacs-users
+# diff_command="eval emacs -nw --eval=\(ediff\ \"%file1\"\ \"%file2\"\)"
+#using_editor=1
+
# vim-users: you CAN use vimdiff for diff_command. (see NOTE_1)
-diff_command="diff -uN %file1 %file2"
-using_editor=0
#diff_command="vim -d %file1 %file2"
#using_editor=1
+diff_command="diff -uN %file1 %file2"
+using_editor=0
+
# vim-users: don't use vimdiff for merging (see NOTE_1)
merge_command="sdiff -s -o %merged %orig %new"
@@ -68,4 +73,3 @@
# choose while using those programs)
# NOTE_2: Make sure pager is set to "" when using an editor as diff_command!