Meld

Install meld

sudo apt install meld

3-way compare

  1. Select File comparison

  2. Check 3-way comparison

  3. If you’re merging changes from file a to file b into file c, select the files in that order (a, b, c). Alternatively, you can select them in reverse order if you wish to work on the left side (c, b, a).