diff options
Diffstat (limited to 'bin/snapshot')
| -rwxr-xr-x | bin/snapshot | 8 |
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 |