--- a/components/vim/vim-core.p5m	Tue Oct 04 15:53:56 2016 -0700
+++ b/components/vim/vim-core.p5m	Mon Sep 26 21:06:11 2016 -0700
@@ -20,10 +20,11 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+#
 set name=pkg.fmri \
     value=pkg:/editor/vim/vim-core@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Vi IMproved (core executables)"
@@ -34,12 +35,13 @@
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Editors \
     value="org.opensolaris.category.2008:System/Text Tools"
-set name=info.repository-changeset value=$(HG_REV)
-set name=info.repository-url value=$(HG_REPO)
+set name=info.repository-changeset value=$(GIT_COMMIT_ID)
+set name=info.repository-url value=$(GIT_REPO)
 set name=info.upstream [email protected]
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2007/267
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
 link path=usr/bin/ex target=vim
 link path=usr/bin/vi target=vim
 link path=usr/bin/view target=vim
@@ -97,6 +99,7 @@
 link path=usr/share/man/ru.UTF-8/man1/view.1 target=vim.1
 file path=usr/share/man/ru.UTF-8/man1/vim.1
 file help_minimized.txt path=usr/share/vim/$(VIMVER)/doc/help_minimized.txt
+#
 license license license="VIM License"
 
 # Make sure that we don't install simultaneously with an "old" vim that has the