Post reply

Warning: this topic has not been posted in for at least 120 days.
Unless you're sure you want to reply, please consider starting a new topic.
Name:
Email:
Subject:
Message icon:

Verification:
Type the letters shown in the picture
Listen to the letters / Request another image

Type the letters shown in the picture:
What is the last letter in the word "SlickEdit":
How many LETTERS are in the following? "a1b2c3":
Which number is missing?  "12345689":

shortcuts: hit alt+s to submit/post or alt+p to preview


Topic Summary

Posted by: bodisafa
« on: March 06, 2021, 05:18:30 PM »

Here are two quick macros that I have been using for merging via the external tool Araxis Merge.

Calls Araxis Merge on the current open file in two flavors:
mergeitsolo: Just the buffer in a single pane.
mergeit: Diff with the lhs and rhs being the same buffer name.

I do a lot of work with multiple Perforce streams, but you can extend this to other goodness.

- Jeff :)