[Bug 242212] usr.sbin/mergemaster/mergemaster.sh: There is no logic to handle symbolic links

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242212

--- Comment #10 from commit-hook at FreeBSD.org ---
A commit references this bug:

Author: imp
Date: Wed Nov 18 19:22:24 UTC 2020
New revision: 367810
URL: https://svnweb.freebsd.org/changeset/base/367810

Log:
  mergemaster: handle symbolic links during update.

  /etc/os-release is now a symbolic link to a generated file. Make
  mergemaster cope with symbolic links generically. I'm no longer
  a big mergemaster user, so this has only been lightly tested
  by me, though Kimura-san has ran it through its paces.

  Submitted by: Yasushiro KIMURA-san
  PR: 242212
  MFC After: 2 weeks

Changes:
  head/usr.sbin/mergemaster/mergemaster.sh

-- 
You are receiving this mail because:
You are the assignee for the bug.