we now always use the default editor except for special files
merger.py