├── .gitignore ├── .travis.yml ├── README.md ├── index.coffee ├── package.json └── test └── test.coffee /.gitignore: -------------------------------------------------------------------------------- 1 | node_modules 2 | -------------------------------------------------------------------------------- /.travis.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/falsecz/3-way-merge/HEAD/.travis.yml -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/falsecz/3-way-merge/HEAD/README.md -------------------------------------------------------------------------------- /index.coffee: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/falsecz/3-way-merge/HEAD/index.coffee -------------------------------------------------------------------------------- /package.json: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/falsecz/3-way-merge/HEAD/package.json -------------------------------------------------------------------------------- /test/test.coffee: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/falsecz/3-way-merge/HEAD/test/test.coffee --------------------------------------------------------------------------------