rejmerge: update rejmerge.conf, relbump

rejmerge/.md5sum

@@ -1,3 +1,3 @@
 bb6b53fb0b708e2ff76da0545dab0476  gnufind.patch
 d48dc7c4cce7af23a5205659d09d0b47  rejmerge-5.45.1-8f11379.tar.gz
-052ff9c2a3848004406a5e1eaf4087a0  rejmerge.conf
+8d334c97807d35bf0cd704d4915b386d  rejmerge.conf

rejmerge/Pkgfile

@@ -3,7 +3,7 @@
 
 name=rejmerge
 version=5.45.1-8f11379
-release=1
+release=2
 source="https://github.com/zeppe-lin/$name/archive/${version#*-}/$name-$version.tar.gz
 	rejmerge.conf
 	gnufind.patch"

rejmerge/rejmerge.conf

@@ -9,11 +9,16 @@ export PATH="/sbin:/usr/sbin:/bin:/usr/bin"
 rejmerge_diff() { diff -u --color=always "$1" "$2" > "$3"; }
 
 # Use vim(1) as default editor instead of vi(1).
-EDITOR=${EDITOR:-vim}
+EDITOR="vim"
 
-# Use less(1) as pager instead of the default more(1).  The option
-# '-R' is required since the diff(1) produces raw control chars.
-PAGER=${PAGER:-"less -R -Prejmerge"}
+# Use less(1) as pager instead of the default more(1).
+# The option '-R' is required since the diff(1) produces raw control
+# chars.
+# The option '-X' disables sending the termcap initialization and
+# deinitialization strings to the terminal.  This is sometimes
+# desireable if the deinitialization string does something
+# unnecessary, like clearing the screen.
+PAGER="less -RX -Prejmerge"
 
 # vim: ft=sh
 # End of file.