# # /etc/rejmerge.conf: rejmerge(8) configuration # # Uncomment this if you are an emacs-user. # # rejmerge_merge() # { # emacs -nw --eval '(ediff-merge "'$1'" "'$2'" nil "'$3'")' # } # End of file