I never really liked any of the
mergetools out there so I made a program that is somewhat easier to use.
$ go get github.com/mkchoi212/fac
Or using Homebrew
brew tap mkchoi212/fac https://github.com/mkchoi212/fac.git brew install fac
fac operates much like
git add -p . It has a prompt input at the bottom of the screen where the user inputs various commands.
The commands have been preset to the following specifications
|w||show more lines up|
|s||show more lines down|
|a||use local version|
|d||use incoming version|
|e||manually edit code|
[w,a,s,d,?] >> [INPUT HERE]
The above key-bindings and various behaviors can be altered by creating a
.fac.yml file in your home directory.
Please refer to the configuration README.md for more information.
This is an open source project so feel free to contribute by