Re: p4merge no longer working after upgrade to 2.26.0

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Apr 24, 2020 at 08:57:27AM +0200, Lars Fricke wrote:
> 
> git mergetool --tool-help indeed does NOT list p4merge.

but does show if you run :

  $ PATH=$PATH:/opt/perforce/bin

> So support was discontinued?

no; something else might be broken (hopefully only in your setup)
it seems to work at least on mine :

  $ git version
  git version 2.26.2.266.ge870325ee8
  $ git config --list | grep p4
  merge.tool=p4merge

Carlo



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux