|
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] |