Bug 71210 - Update to GNU sdiff: add user-preference for merge keys
Summary: Update to GNU sdiff: add user-preference for merge keys
Status: Closed Overcome By Events
Alias: None
Product: Base System
Classification: Unclassified
Component: gnu (show other bugs)
Version: Unspecified
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-bugs (Nobody)
Depends on:
Reported: 2004-08-31 20:40 UTC by cswiger
Modified: 2016-06-11 04:18 UTC (History)
1 user (show)

See Also:

file.diff (9.09 KB, patch)
2004-08-31 20:40 UTC, cswiger
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description cswiger 2004-08-31 20:40:24 UTC
A recent discussion on -current about the default keys for mergemaster suggests that people find using 'l' and 'r' inconvenient.  I think '1' and '2' are likely to be more reasonable even on foreign keyboard layouts, and have updated the default behavior to reflect this.  The following patch also lets one define an SDIFF_MERGE_KEYS environment variable to pick any pair of keys they prefer.

How-To-Repeat: N/A--see mailing lists for prior discussion.

[ Note that my PR mail bounced, so I'm posting this via WWW form.  Sorry if this mangles tabs and spaces in the diff in the next section, original copy is at: http://www.pkix.net/~chuck/sdiff.diff ]
Comment 1 Pedro F. Giffuni freebsd_committer 2016-06-11 04:18:49 UTC
As of FreeBSD 11, GNU sdiff has been replaced with a "permissively licensed" version so it doesn't make much sense to add features to the GNU version that may be missed in the newer version.