--- a/components/git/git.p5m Thu Mar 23 08:04:21 2017 -0700
+++ b/components/git/git.p5m Mon Mar 27 13:40:48 2017 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/lib/git-core/.* -> default mode 0555>
@@ -164,7 +164,6 @@
file path=usr/lib/git-core/git-rebase--merge
hardlink path=usr/lib/git-core/git-receive-pack target=git
hardlink path=usr/lib/git-core/git-reflog target=git
-file path=usr/lib/git-core/git-relink
hardlink path=usr/lib/git-core/git-remote target=git
hardlink path=usr/lib/git-core/git-remote-ext target=git
hardlink path=usr/lib/git-core/git-remote-fd target=git
@@ -226,6 +225,7 @@
file path=usr/lib/git-core/mergetools/diffuse
file path=usr/lib/git-core/mergetools/ecmerge
file path=usr/lib/git-core/mergetools/emerge
+file path=usr/lib/git-core/mergetools/examdiff
file path=usr/lib/git-core/mergetools/gvimdiff
file path=usr/lib/git-core/mergetools/gvimdiff2
file path=usr/lib/git-core/mergetools/gvimdiff3
@@ -249,7 +249,6 @@
file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Prompt.3
file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Ra.3
file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Utils.3
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Git/.packlist
# perl/Makefile.PL installs this file if and only if 'require Error' fails.
# Thus if git is installed, it succeeds, and the file is not installed. So
# ignore that and just pull from the source.
@@ -275,6 +274,7 @@
file path=usr/share/git-core/templates/hooks/pre-commit.sample
file path=usr/share/git-core/templates/hooks/pre-push.sample
file path=usr/share/git-core/templates/hooks/pre-rebase.sample
+file path=usr/share/git-core/templates/hooks/pre-receive.sample
file path=usr/share/git-core/templates/hooks/prepare-commit-msg.sample
file path=usr/share/git-core/templates/hooks/update.sample
file path=usr/share/git-core/templates/info/exclude
@@ -313,6 +313,7 @@
file path=usr/share/git-gui/lib/msgs/ja.msg
file path=usr/share/git-gui/lib/msgs/nb.msg
file path=usr/share/git-gui/lib/msgs/pt_br.msg
+file path=usr/share/git-gui/lib/msgs/pt_pt.msg
file path=usr/share/git-gui/lib/msgs/ru.msg
file path=usr/share/git-gui/lib/msgs/sv.msg
file path=usr/share/git-gui/lib/msgs/vi.msg
@@ -342,6 +343,7 @@
file path=usr/share/gitk/lib/msgs/it.msg
file path=usr/share/gitk/lib/msgs/ja.msg
file path=usr/share/gitk/lib/msgs/pt_br.msg
+file path=usr/share/gitk/lib/msgs/pt_pt.msg
file path=usr/share/gitk/lib/msgs/ru.msg
file path=usr/share/gitk/lib/msgs/sv.msg
file path=usr/share/gitk/lib/msgs/vi.msg
@@ -462,7 +464,6 @@
file path=usr/share/man/man1/git-rebase.1
file path=usr/share/man/man1/git-receive-pack.1
file path=usr/share/man/man1/git-reflog.1
-file path=usr/share/man/man1/git-relink.1
file path=usr/share/man/man1/git-remote-ext.1
file path=usr/share/man/man1/git-remote-fd.1
file path=usr/share/man/man1/git-remote-testgit.1