where to add? probably should stick to the rules, and add it to JGit as a method.
Can move the writeConflictFiles functions in pull and merge to mergetool. Need to set/get gitconfig to specify/read what mergetool is installed (meld/P4Merge)
- look in gitconfig to find mergetool setting or command.
- execute external mergetool or raise error if not found.
- mark as resolved by
adding saved files to index.
QED
where to add? probably should stick to the rules, and add it to
JGitas a method.Can move the
writeConflictFilesfunctions inpullandmergetomergetool. Need to set/getgitconfigto specify/read what mergetool is installed (meld/P4Merge)addingsaved files to index.QED