Conflicts:
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 3 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:
modified: env/install-eos.sh
new file: env/template.zshrc
modified: include/bildFile.h
modified: src/Objects/DataManip/Makefile
modified: src/Objects/DataManip/bildFile/doc/bildFile.html
modified: src/Objects/DataManip/bildFile/inc/bildFile.h
modified: src/Objects/DataManip/bildFile/src/lmrc2bild.c
new file: src/Objects/DataManip/starFile/Config/Define.inc
new file: src/Objects/DataManip/starFile/Config/Target.inc
new file: src/Objects/DataManip/starFile/Makefile
new file: src/Objects/DataManip/starFile/doc/.footer
new file: src/Objects/DataManip/starFile/doc/.header
new file: src/Objects/DataManip/starFile/doc/.starFile.html
new file: src/Objects/DataManip/starFile/doc/Makefile
new file: src/Objects/DataManip/starFile/inc/Makefile
new file: src/Objects/DataManip/starFile/src/.CCHeader
new file: src/Objects/DataManip/starFile/src/.CHeader
new file: src/Objects/DataManip/starFile/src/.Ruby
new file: src/Objects/DataManip/starFile/src/.Wish
new file: src/Objects/DataManip/starFile/src/Makefile
new file: src/Objects/DataManip/starFile/src/X86MAC64
modified: src/Objects/Makefile
modified: src/Tools/filter/mrc2bild/Config/OptionControlFile
modified: src/Tools/filter/mrc2bild/inc/mrc2bild.h
modified: src/Tools/filter/mrc2bild/src/argCheck.c
modified: src/Tools/filter/mrc2bild/src/init.c
modified: src/Tools/filter/mrc2bild/src/mrc2bild.c
modified: src/Tools/filter/mrc2bild/src/mrc2bild.html
modified: src/Tools/filter/mrc2bild/src/mrc2bild.pane
modified: src/Tools/filter/mrc2bild/src/test/Makefile
modified: src/Tools/filter/mrc2bild/src/usage.c
modified: src/Tools/mrcImage/.Source
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/Config/Define.inc
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/Config/OptionControlFile
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/Config/Target.inc
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/Makefile
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/doc/Makefile
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/inc/config.h
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/inc/mrcImageBlurByTemperatureFactor.h
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/.Depend
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/.Source
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/Makefile
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/argCheck.c
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/init.c
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/mrcImageBlurByTemperatureFactor.c
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/mrcImageBlurByTemperatureFactor.pane
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/test/Makefile
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/test/data
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/usage.c
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/util.c
OSDN Git Service
