|
|
222 views
1 replies
  |
| Bjarne |
Diffinity - Merge with Git? |
2020-02-25 08:38:45 |
Hi. I am very pleased with the visual style you make your diffs, but I would really like to be able to do a merge between two files from Git. Is this possible?
I think the command line options required for this to work is , but I am not sure.
Kind regards
Bjarne |
| Michael Lidgren |
Re: Diffinity - Merge with Git? |
2020-02-25 12:25:38 |
Hi!
Try something like this:
git difftool -y -x "C:\Program Files (x86)\Diffinity/Diffinity.exe" -- myfile.txt
--michael |
|
 |
|
|
|
|
|
