I am using the default version of mercurial without much modifications. By default it uses "vimdiff" for the purpose which I wasn't familiar with. I am going to explain the situtation:
After 1st commit on default branch:
#include <stdio.h>
int main
After 1st commit on xyz branch:
#include <stdio.h>
int main()
{
return 0;
}
After 2nd commit on default branch:
#include <stdio.h>
#define MAX(x, y) (x > y ? x : y)
int main
Expected code after merging xyz branch into default branch:
#include <stdio.h>
#define MAX(x, y) (x > y ? x : y)
int main()
{
return 0;
}
In what way should I accept/discard hunks/diffs/parts of code to obtain the expected result either in vimdiff or ediff. If there is an alternative way to solve this problem then please share.
