Stack Overflow
Stack Overflow

Questions tagged [p4merge]

Perforce visual merge tool, which allows users to visualize the differences between file versions.

P4Merge is the Perforce visual merge tool.

P4Merge allows users to visualize the differences between file versions. P4Merge uses color coding to simplify the process of resolving conflicts that result from parallel or concurrent development.

  • Text files differences can be highlighted and edited
  • Includes or ignores line ending or whitespace differences
  • Supports Windows (CRLF), Mac (CR), and Unix (LF) line ending conventions
  • Accepts command-line parameters and can be used from non-Peforce applications
  • Displays line numbers when comparing and merging files

P4Merge is available on the downloads page of Perforce at Downloads > Browse by Platform > Download P4Merge.

48 questions
0
votes
1 answer

How do I clear the unused conflict files down after resolving conflict?

I have resolved a conflict using p4Merge. It worked and the file now has the updated text. However in the folder is a load of junk like... --> file.txt.BACKUP --> file.txt.BASE --> file.txt.LOCAL How do I made sure my merge tool cleans up these…
Exitos
  • 29,230
  • 38
  • 123
  • 178
0
votes
1 answer

accurev merge doesn't pass file titles to external merge tool

I'm using p4merge as external merge tool for Accurev. I created a wrapper for p4merge and set the command "p4m -dw -tw 8 -nb %3% -nl %4% -nr %5% %a% %1% %2% %o%" for both acgui (Tools-Preferences-Diff/merge) and CLI (AC_MERGE_CLI variable). It…
Rom098
  • 2,445
  • 4
  • 35
  • 52
0
votes
1 answer

How do I see the changes made in a particular module by someone in his/her changelist

A coworker submitted a gigantic changelist (>1000 files) as part of a refactoring, and perforce just shows it as 'There are 1000 files in this changelist'. I'd like to see the changes he made to all files in a folder/module via Perforce p4merge or…
Siddhartha
  • 4,296
  • 6
  • 44
  • 65
1 2 3
4