[Top][All Lists]

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

patch & merge

From: viki
Subject: patch & merge
Date: Wed, 23 Jul 2008 23:50:47 -0700 (PDT)
User-agent: G2/1.0

1. Whcih option of patch makes it insert conflicts
inline into the patched file, with
markers, as svn merge does ?

2. Does gnu utilities set have 'merge' utility that can
merge 3 files, with conflicts labeled as above ?


reply via email to

[Prev in Thread] Current Thread [Next in Thread]