summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-02-17 21:29:41 (GMT)
committerlrknox <lrknox>2017-02-17 21:29:41 (GMT)
commit4b0de5860f42e0f4a0d7a0c293a84789cfb1c8a3 (patch)
tree92336690c578f26db34b2ad8b1ebfcbd2f0e6393
parenta22a9fe733731a6f03e07550cd9236ebbf310904 (diff)
parentf37f35245d10afc251aa2398b7cfe186ea927c78 (diff)
downloadhdf5-4b0de5860f42e0f4a0d7a0c293a84789cfb1c8a3.zip
hdf5-4b0de5860f42e0f4a0d7a0c293a84789cfb1c8a3.tar.gz
hdf5-4b0de5860f42e0f4a0d7a0c293a84789cfb1c8a3.tar.bz2
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop
-rwxr-xr-xbin/snapshot8
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/snapshot b/bin/snapshot
index cc4bbc9..68cad59 100755
--- a/bin/snapshot
+++ b/bin/snapshot
@@ -124,7 +124,11 @@ CHECKINSTALL()
# Safety measure to avoid unintended checkins to other repositories.
COMMITSNAPSHOT()
{
+<<<<<<< HEAD
echo "original hdf5 script committed code changes back into git."
+=======
+ echo "original hdf5 script checked code back into svn."
+>>>>>>> f37f35245d10afc251aa2398b7cfe186ea927c78
}
DISPLAYUSAGE()
@@ -512,7 +516,11 @@ done
#=============================
if [ "$cmd" = "all" -o -n "$cmdcheckout" ]; then
TIMESTAMP "checkout"
+<<<<<<< HEAD
# ${BASEDIR}/bin is now updated from git by EveningMaint or DailyMaint
+=======
+ # ${BASEDIR}/bin is now updated from svn by EveningMaint or DailyMaint
+>>>>>>> f37f35245d10afc251aa2398b7cfe186ea927c78
# to avoid updating the scripts in ${BASEDIR}/bin while they are running.
if [ -z "$AUTOGEN" ]; then