diff options
Diffstat (limited to 'bin/etc-update')
| -rwxr-xr-x | bin/etc-update | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/bin/etc-update b/bin/etc-update index 60a55e3b0..7239ed07b 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -412,8 +412,16 @@ Please select from the menu above (-1 to exit, losing this merge): " rm ${rm_opts} "${file}" return 255 ;; - 2) ( echo "Showing differences between ${ofile} and ${mfile}" - diff_command "${ofile}" "${mfile}" ) | ${pager} + 2) if [ "${using_editor}" == 0 ]; then + ( + echo "Showing differences between ${ofile} and ${mfile}" + diff_command "${ofile}" "${mfile}" + ) | ${pager} + else + echo "Beginning of differences between ${ofile} and ${mfile}" + diff_command "${ofile}" "${mfile}" + echo "End of differences between ${ofile} and ${mfile}" + fi continue ;; 3) break |