search

mikofski / JGit4MATLAB

JGit wrapper for MATLAB
https://mikofski.github.io/JGit4MATLAB
BSD 2-Clause "Simplified" License
5 stars 3 forks source link

add mergetool #11

Open mikofski opened 10 years ago

mikofski commented 10 years ago

where to add? probably should stick to the rules, and add it to JGit as a method.

JGit.mergetool

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)

  1. look in gitconfig to find mergetool setting or command.
  2. execute external mergetool or raise error if not found.
  3. mark as resolved by adding saved files to index.

QED

mikofski commented 10 years ago

A couple options in addition to meld and p4m are: