Questions tagged [emerge]
The emerge tag has no usage guidance.
3
questions
0
votes
1answer
60 views
How to efficiently merge 2 buffers which are partially overlapping?
Problem summary
Imagine, you have 2 shopping lists:
1 huge one with hundreds of entries - list A, copied into buffer A
1 containing dozens of entries - list B, copied into buffer B
Then:
75% of ...
3
votes
1answer
82 views
Is there a way to ask Emerge to "pick both"?
As far as I can see I only have the options to pick either A, or B, but not both. I occasionally want to pick both A and B. I know I can just go to the C buffer and edit the file by hand, but it ...
3
votes
1answer
443 views
How do you hook up git to emerge through emacsclient?
I previously had the following script in a file called .emacs.d/emerge-for-git:
#!/bin/sh
emacs -Q $*
And In my .gitconfig:
[merge]
tool = emerge
[mergetool "emerge"]
path = /home/rovanion/....
