v1.1.0

Changelog

ce0a043 Update application screenshot
3d7e70d Add CI and Go report badges
51ef7cb Remove dummy git repo
42aacb4 Remove command tests
d6bb1b5 Add Travis CI config file
eb4a2ad Colorize diff3 separator marker
2230b51 Add tests for summary.go
a04cfa0 Add support for diff3 conflict styling
b0d661b Move and rename dummy git repo
c1dd493 Refactor git conflict marker parsing methods
769ab01 Ignore existing conflict in test git submodule
7637551 Refactor git calling functions
05c8288 Add dummy git repo with conflict for testing
83ac734 Move documents to assets
d8fe975 Update comments on functions
ecba69c Use dep
bf242e3 Remove vendor directory
2afd0bd Merge pull request #33 from shogo-ma/master
312f7c1 fix typo
fb868ea Merge pull request #27 from olshevskiy87/t1
c4d1d39 Merge pull request #31 from jnv/patch-1
ba183d4 Goreleaser: Remove dep on go in Brew formula
c86e474 Merge pull request #28 from antham/patch-1
9657490 Fix typo
8684e49 find and open conflict files from root git directory
8f11fd7 Merge pull request #24 from wezm/man
0a500c2 Add man page
4addf0d fac version v1.0.4