Allow specification of a custom merge type via an environment variable, $MERGE

xsuchy / rpmconf

Tool to handle rpmnew and rpmsave files

44 stars 19 forks source link

Allow specification of a custom merge type via an environment variable, $MERGE #6

Closed mavit closed 9 years ago

mavit commented 11 years ago

The rationale for this is that I prefer to use Emacs ediff to do my merging, but there's no standard way to do this from outside of Emacs so I'm using my own wrapper script.

xsuchy commented 11 years ago

Beside those two comments, I like it.

xsuchy commented 9 years ago

Implemented as 31c3a5f