[Gnu-arch-users] <<< conflict markers

gnu-arch-users

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnu-arch-users] <<< conflict markers

From:	Jani Monoses
Subject:	[Gnu-arch-users] <<< conflict markers
Date:	Wed, 14 Apr 2004 18:20:59 +0300

star-merge -t generates diff3 style merges instead of making conflict
files and rejects.
It seems to me such a feature would be useful for other patch applying
commands as well such as redo replay etc. Comments? This is not a
feature request because again I might miss some deep reason why only
star-merge has/needs this.

Jani

[Prev in Thread]

Current Thread

[Next in Thread]

[Gnu-arch-users] <<< conflict markers, Jani Monoses <=
- Re: [Gnu-arch-users] <<< conflict markers, Tom Lord, 2004/04/14
  - Re: [Gnu-arch-users] <<< conflict markers, Jan Hudec, 2004/04/14
    - Re: [Gnu-arch-users] <<< conflict markers, Tom Lord, 2004/04/14
  - [Gnu-arch-users] Re: <<< conflict markers, Stefan Monnier, 2004/04/14
    - Re: [Gnu-arch-users] Re: <<< conflict markers, Jan Hudec, 2004/04/14
    - Re: [Gnu-arch-users] Re: <<< conflict markers, Stefan Monnier, 2004/04/14
    - Re: [Gnu-arch-users] Re: <<< conflict markers, Jan Hudec, 2004/04/14
    - Re: [Gnu-arch-users] Re: <<< conflict markers, Aaron Bentley, 2004/04/15
    - [Gnu-arch-users] Re: <<< conflict markers, Miles Bader, 2004/04/15
    - Re: [Gnu-arch-users] Re: <<< conflict markers, Aaron Bentley, 2004/04/14

Prev by Date: [Gnu-arch-users] webdav take 2
Next by Date: Re: [Gnu-arch-users] [MERGE REQUEST] arguments in $EDITOR
Previous by thread: [Gnu-arch-users] webdav take 2
Next by thread: Re: [Gnu-arch-users] <<< conflict markers
Index(es):
- Date
- Thread