Friday 08 Nov 2013

Friday 08 Nov 2013

thomas@T:\~/work_house/partclone\$ git pull https://github.com/pfrouleau/partclone image_format_0002 From https://github.com/pfrouleau/partclone

  • branch image_format_0002 -> FETCH_HEAD

Auto-merging toolbox CONFLICT (content): Merge conflict in toolbox Auto-merging tests/Makefile.in CONFLICT (add/add): Merge conflict in tests/Makefile.in Auto-merging src/partclone.h CONFLICT (content): Merge conflict in src/partclone.h Auto-merging src/partclone.c CONFLICT (content): Merge conflict in src/partclone.c Auto-merging src/main.c CONFLICT (content): Merge conflict in src/main.c Auto-merging src/info.c CONFLICT (content): Merge conflict in src/info.c Auto-merging src/btrfsclone.c CONFLICT (content): Merge conflict in src/btrfsclone.c Auto-merging src/Makefile.in CONFLICT (add/add): Merge conflict in src/Makefile.in Auto-merging docs/Makefile.in CONFLICT (add/add): Merge conflict in docs/Makefile.in Auto-merging config.h.in CONFLICT (add/add): Merge conflict in config.h.in Auto-merging Makefile.in CONFLICT (add/add): Merge conflict in Makefile.in Automatic merge failed; fix conflicts and then commit the result.

Comments