merge conflict

iandstanley · iandstanley · commit 53c51ad4e844 · 2021-06-17T01:16:53.000+01:00
diff --git a/notes b/notes
@@ -427,7 +427,7 @@ cmd_find () {
 
 	for file in ${USE_POINTER}/*.gpg
 	do
-		gpg -d $file  2>/dev/null | grep -H --label ${file}   $searchterm 
+		gpg -d $file  2>/dev/null | grep -H --label ${file}   "$searchterm" 
 	done
 }
 

Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,7 @@ cmd_find () {`
`427`	`427`
`428`	`428`	`for file in ${USE_POINTER}/*.gpg`
`429`	`429`	`do`
`430`		`- gpg -d $file 2>/dev/null \| grep -H --label ${file} $searchterm`
	`430`	`+ gpg -d $file 2>/dev/null \| grep -H --label ${file} "$searchterm"`
`431`	`431`	`done`
`432`	`432`	`}`
`433`	`433`