[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merge conlict?
From: |
Eli Zaretskii |
Subject: |
Re: merge conlict? |
Date: |
Mon, 25 Jan 2010 14:02:34 +0200 |
> From: Teemu Likonen <address@hidden>
> Cc: "Mark A. Hershberger" <address@hidden>, address@hidden
> Date: Mon, 25 Jan 2010 13:33:38 +0200
>
> It would probably help if Bazaar supported combined diff format. With
> Git we can trivially see the actual changes introduced by the merge
> commit:
>
>
> $ git show b8de0d6
Please help me understand what you ``trivially'' see in this output.
I clearly see here changes not made by Mark, and having no Git
knowledge I cannot discern between the changes, because the format
shown is not exactly the Diff format.
Re: merge conlict?, Stefan Monnier, 2010/01/25
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Andreas Schwab, 2010/01/26
- Re: merge conlict?, Óscar Fuentes, 2010/01/26
- Re: merge conlict?, Andreas Schwab, 2010/01/26
- Re: merge conlict?, Andreas Schwab, 2010/01/26
Re: merge conlict?, Teemu Likonen, 2010/01/25
- Re: merge conlict?,
Eli Zaretskii <=
Interpreting git diff --cc [was: merge conlict?], Stephen J. Turnbull, 2010/01/25
Re: merge conlict?, Richard Stallman, 2010/01/25
Re: merge conlict?, Richard Stallman, 2010/01/25