Re: How to resolve the following merge conflicts in hg

[Compro P. <com...@gm...>]

Not related to clisp.
I am using the default version of mercurial without much modifications.
Thus it produces the merge conflicts given in the screenshot(attachment).
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 I should 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.

On Thu, Mar 16, 2017 at 12:08 AM, Compro Prasad <com...@gm...>
wrote:

> Not related to clisp.
> I am using the default version of mercurial without much modifications.
> Thus it produces the merge conflicts given in the screenshot(attachment).
> 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 I should 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.
>