# # /etc/rejmerge.conf: rejmerge(8) configuration # diff_menu() { rejmerge_diff "$1" "$2" "$TMPFILE" while true; do info "$1" colordiff -pruN "$1" "$2" | more while true; do info_n "[K]eep [U]pgrade [M]erge [D]iff [S]kip? " read -n1 CMD echo case "$CMD" in k|K) rm -f "$2" break 2 ;; u|U) mv -f "$2" "$1" break 2 ;; m|M) merge_menu "$1" "$2" break 2 ;; d|D) break 1 ;; s|S) break 2 ;; esac done done : > "$TMPFILE" } # End of file