summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2018-05-18Integrate codecov with Travis CImore-testsMike JS. Choi
2018-05-18Test: Add tests for summary.goMike JS. Choi
2018-05-18Test: Add tests for parse.goMike JS. Choi
2018-05-18Test: Add tests for file.goMike JS. Choi
2018-05-18Test: Add tests for conflict.goMike JS. Choi
2018-05-18Refactoring: Remove all global state via File structsMike JS. Choi
2018-05-18Add global test casesMike JS. Choi
2018-05-17Add testdata directory for dummy test filesMike JS. Choi
2018-05-17Update gitignoreMike JS. Choi
2018-05-17Update Travis CI for code coverageMike JS. Choi
2018-05-12Add new fac bannerMike JS. Choi
2018-05-11Brew formula update for fac version v1.1.0Mike Choi
2018-05-11Update application screenshotv1.1.0Mike JS. Choi
2018-05-11Add CI and Go report badgesMike JS. Choi
2018-05-11Remove dummy git repoMike JS. Choi
2018-05-11Remove command testsMike JS. Choi
2018-05-11Add Travis CI config fileMike JS. Choi
2018-05-11Colorize diff3 separator markerMike JS. Choi
2018-05-11Add tests for summary.goMike JS. Choi
2018-05-11Add support for diff3 conflict stylingMike JS. Choi
2018-05-11Move and rename dummy git repoMike JS. Choi
2018-05-11Refactor git conflict marker parsing methodsMike JS. Choi
2018-05-11Ignore existing conflict in test git submoduleMike JS. Choi
2018-05-11Refactor git calling functionsMike JS. Choi
2018-05-11Add dummy git repo with conflict for testingMike JS. Choi
2018-05-11Move documents to assetsMike JS. Choi
2018-05-11Update comments on functionsMike JS. Choi
2018-05-11Use depshogo-ma
2018-05-11Remove vendor directoryshogo-ma
2018-04-06Merge pull request #33 from shogo-ma/masterMike JS. Choi
2018-04-07fix typoshogo-ma
2018-03-10Merge pull request #27 from olshevskiy87/t1Mike JS. Choi
2018-02-28Merge pull request #31 from jnv/patch-1Mike JS. Choi
2018-02-28Goreleaser: Remove dep on go in Brew formulaJan Vlnas
2018-02-04Merge pull request #28 from antham/patch-1Mike JS. Choi
2018-02-04Fix typoAnthony HAMON
2018-01-28find and open conflict files from root git directoryDmitriy Olshevskiy
2018-01-09Merge pull request #24 from wezm/manMike JS. Choi
2018-01-10Add man pageWesley Moore
2018-01-06fac version v1.0.4Mike Choi
2018-01-06Adjust scroll up behaviorv1.0.4Mike JS. Choi
2018-01-06Add warning message for unsupported diff3 conflict styleMike JS. Choi
2018-01-06Change function nameMike JS. Choi
2018-01-06Update README about diff3 supportMike JS. Choi
2018-01-05fac version v1.0.3Mike Choi
2018-01-05Update size of prompt panel to fit new prompt stringv1.0.3Mike JS. Choi
2018-01-05Update prompt string with a question markMike JS. Choi
2018-01-05Add additional edge case for when there are no conflictsMike JS. Choi
2018-01-04Merge pull request #20 from shogo-ma/iotaMike JS. Choi
2018-01-04Merge pull request #19 from xyproto/emojiMike JS. Choi
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 23:13:08 +0000