Conflicts:
.DS_Store
src/Tools/Config/Define.inc
It looks like you may be committing a merge.
If this is not correct, please remove the file
.git/MERGE_HEAD
and try again.
Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 8 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
All conflicts fixed but you are still merging.
Changes to be committed:
deleted: ../.DS_Store
modified: ../.gitignore
new file: ../bin/mrcImageCurl
new file: ../bin/mrcImageDivergence
new file: ../bin/mrcImageGradient
new file: ../bin/mrcImageOpticalFlow
new file: ../bin/mrcImageStreamLine
modified: ../bin/wish/Display2/tclIndex
modified: ../src/.DS_Store
modified: ../src/Objects/DataManip/mrcImage/src/lmrcFFTExpression.c
modified: ../src/Tools/.DS_Store
modified: ../src/Tools/.Source
modified: ../src/Tools/Config/Define.inc
modified: ../src/Tools/filter/tiff2mrc/src/tiff2mrc.c
modified: ../src/Tools/mrcImage/.Source
modified: ../src/Tools/mrcImage/.Source.org
new file: ../src/Tools/mrcImage/mrcImageCurl/Config/Define.inc
new file: ../src/Tools/mrcImage/mrcImageCurl/Config/OptionControlFile
new file: ../src/Tools/mrcImage/mrcImageCurl/Config/Target.inc
new file: ../src/Tools/mrcImage/mrcImageCurl/Makefile
new file: ../src/Tools/mrcImage/mrcImageCurl/doc/Makefile
new file: ../src/Tools/mrcImage/mrcImageCurl/inc/config.h
new file: ../src/Tools/mrcImage/mrcImageCurl/inc/mrcImageCurl.h
new file: ../src/Tools/mrcImage/mrcImageCurl/src/.Depend
new file: ../src/Tools/mrcImage/mrcImageCurl/src/.Source
new file: ../src/Tools/mrcImage/mrcImageCurl/src/Makefile
new file: ../src/Tools/mrcImage/mrcImageCurl/src/X86MAC64
new file: ../src/Tools/mrcImage/mrcImageCurl/src/argCheck.c
new file: ../src/Tools/mrcImage/mrcImageCurl/src/init.c
new file: ../src/Tools/mrcImage/mrcImageCurl/src/mrcImageCurl.c
new file: ../src/Tools/mrcImage/mrcImageCurl/src/mrcImageCurl.html
new file: ../src/Tools/mrcImage/mrcImageCurl/src/mrcImageCurl.pane
new file: ../src/Tools/mrcImage/mrcImageCurl/src/test/Makefile
new file: ../src/Tools/mrcImage/mrcImageCurl/src/test/data
new file: ../src/Tools/mrcImage/mrcImageCurl/src/test/test.3d.curlz
new file: ../src/Tools/mrcImage/mrcImageCurl/src/test/test.3d.curlz2
new file: ../src/Tools/mrcImage/mrcImageCurl/src/usage.c
new file: ../src/Tools/mrcImage/mrcImageCurl/src/util.c
new file: ../src/Tools/mrcImage/mrcImageDivergence/Config/Define.inc
new file: ../src/Tools/mrcImage/mrcImageDivergence/Config/OptionControlFile
new file: ../src/Tools/mrcImage/mrcImageDivergence/Config/Target.inc
new file: ../src/Tools/mrcImage/mrcImageDivergence/Makefile
new file: ../src/Tools/mrcImage/mrcImageDivergence/doc/Makefile
new file: ../src/Tools/mrcImage/mrcImageDivergence/inc/config.h
new file: ../src/Tools/mrcImage/mrcImageDivergence/inc/mrcImageDivergence.h
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/.Depend
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/.Source
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/Makefile
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/X86MAC64
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/argCheck.c
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/init.c
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/mrcImageDivergence.c
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/mrcImageDivergence.html
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/mrcImageDivergence.pane
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/test/Makefile
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/test/data
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/usage.c
new file: ../src/Tools/mrcImage/mrcImageDivergence/src/util.c
new file: ../src/Tools/mrcImage/mrcImageGradient/Config/Define.inc
new file: ../src/Tools/mrcImage/mrcImageGradient/Config/OptionControlFile
new file: ../src/Tools/mrcImage/mrcImageGradient/Config/Target.inc
new file: ../src/Tools/mrcImage/mrcImageGradient/Makefile
new file: ../src/Tools/mrcImage/mrcImageGradient/doc/Makefile
new file: ../src/Tools/mrcImage/mrcImageGradient/inc/config.h
new file: ../src/Tools/mrcImage/mrcImageGradient/inc/mrcImageGradient.h
new file: ../src/Tools/mrcImage/mrcImageGradient/src/.Depend
new file: ../src/Tools/mrcImage/mrcImageGradient/src/.Source
new file: ../src/Tools/mrcImage/mrcImageGradient/src/Makefile
new file: ../src/Tools/mrcImage/mrcImageGradient/src/X86MAC64
new file: ../src/Tools/mrcImage/mrcImageGradient/src/argCheck.c
new file: ../src/Tools/mrcImage/mrcImageGradient/src/init.c
new file: ../src/Tools/mrcImage/mrcImageGradient/src/mrcImageGradient.c
new file: ../src/Tools/mrcImage/mrcImageGradient/src/mrcImageGradient.html
new file: ../src/Tools/mrcImage/mrcImageGradient/src/mrcImageGradient.pane
new file: ../src/Tools/mrcImage/mrcImageGradient/src/test/Makefile
new file: ../src/Tools/mrcImage/mrcImageGradient/src/test/data
new file: ../src/Tools/mrcImage/mrcImageGradient/src/usage.c
new file: ../src/Tools/mrcImage/mrcImageGradient/src/util.c
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/Config/Define.inc
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/Config/OptionControlFile
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/Config/Target.inc
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/Makefile
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/doc/Makefile
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/inc/config.h
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/inc/mrcImageOpticalFlow.h
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/.Depend
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/.Source
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/Makefile
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/X86MAC64
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/argCheck.c
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/init.c
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.c
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.html
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.pane
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/test/Makefile
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/test/data
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/usage.c
new file: ../src/Tools/mrcImage/mrcImageOpticalFlow/src/util.c
new file: ../src/Tools/mrcImage/mrcImageStreamLine/Config/Define.inc
new file: ../src/Tools/mrcImage/mrcImageStreamLine/Config/OptionControlFile
new file: ../src/Tools/mrcImage/mrcImageStreamLine/Config/Target.inc
new file: ../src/Tools/mrcImage/mrcImageStreamLine/Makefile
new file: ../src/Tools/mrcImage/mrcImageStreamLine/doc/Makefile
new file: ../src/Tools/mrcImage/mrcImageStreamLine/inc/config.h
new file: ../src/Tools/mrcImage/mrcImageStreamLine/inc/mrcImageStreamLine.h
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/.Depend
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/.Source
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/Makefile
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/X86MAC64
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/argCheck.c
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/init.c
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/mrcImageStreamLine.c
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/mrcImageStreamLine.html
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/mrcImageStreamLine.pane
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/test/Makefile
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/test/data
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/usage.c
new file: ../src/Tools/mrcImage/mrcImageStreamLine/src/util.c
new file: ../util/src/MATH/Config
modified: ../util/src/MATH/Makefile
Changes not staged for commit:
modified: ../include/eosMATH.h
WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
-WORLDNAME=Tools
--WORLDNAME=Tools
--WORLDNAME=Tools
--WORLDNAME=Tools
--WORLDNAME=Tools
--WORLDNAME=Tools