git, $FreeBSD$ and mergemaster

[Jonathan Chen]

Hi,

With the transition to git, I'm now getting a lot of prompts for
differences against an empty $FreeBSD$, eg:

  *** Displaying differences between installed version and ./.cshrc:

--- /.cshrc     2020-09-03 19:14:19.258107000 +1200
+++ ./.cshrc    2020-12-24 14:52:16.751245000 +1300
@@ -1,4 +1,4 @@
-# $FreeBSD: stable/12/bin/csh/dot.cshrc 363525 2020-07-25 11:57:39Z pstef $
+# $FreeBSD$
 #
 # .cshrc - csh resource script, read at beginning of execution by each shell
 #

While I can simply run a "mergemaster -F" to get past this particular
update, how will mergemaster operate in the future when there are
changes in /etc if it can't inspect the $FreeBSD$ tag anymore?

Cheers.
-- 
Jonathan Chen <jonc at chen.org.nz>