You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.0 KiB
42 lines
1.0 KiB
diff -Naur a1/dir/file1.txt b1/dir/file1.txt
|
|
--- a1/dir/file1.txt 2020-06-01 12:07:06.845725100 +0300
|
|
+++ b1/dir/file1.txt 2020-06-01 12:07:16.085725300 +0300
|
|
@@ -1,11 +1,17 @@
|
|
CONFIG_IRQ_WORK=y
|
|
CONFIG_BUILDTIME_EXTABLE_SORT=y
|
|
+CONFIG_THREAD_INFO_IN_TASK=y
|
|
#
|
|
# General setup
|
|
#
|
|
+CONFIG_INIT_ENV_ARG_LIMIT=16
|
|
+# CONFIG_COMPILE_TEST is not set
|
|
+CONFIG_LOCALVERSION=""
|
|
+# CONFIG_LOCALVERSION_AUTO is not set
|
|
CONFIG_BUILD_SALT=""
|
|
CONFIG_HAVE_KERNEL_GZIP=y
|
|
CONFIG_HAVE_KERNEL_BZIP2=y
|
|
+CONFIG_HAVE_KERNEL_LZMA=y
|
|
CONFIG_HAVE_KERNEL_XZ=y
|
|
CONFIG_HAVE_KERNEL_LZO=y
|
|
CONFIG_HAVE_KERNEL_LZ4=y
|
|
diff -Naur a1/dir/file2.txt b1/dir/file2.txt
|
|
--- a1/dir/file2.txt 1970-01-01 03:00:00.000000000 +0300
|
|
+++ b1/dir/file2.txt 2020-06-01 11:44:54.825220300 +0300
|
|
@@ -0,0 +1,16 @@
|
|
+Nine Inch Nails -- Hurt
|
|
+
|
|
+I hurt myself today
|
|
+To see if I still feel
|
|
+I focused on the pain
|
|
+The only thing that real
|
|
+A needle tears a hole
|
|
+The old familiar sting
|
|
+Try to kill it all away
|
|
+But I remember everything.
|
|
+
|
|
+What have I become
|
|
+My sweetest friend
|
|
+Everyone I know
|
|
+Goes away
|
|
+In the end
|