|
| From: | Stefan Monnier |
| Subject: | Re: [Gnu-arch-users] Re: <<< conflict markers |
| Date: | 15 Apr 2004 09:18:42 -0400 |
| User-agent: | Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 |
> Star-merge:
> apply the difference between patch-2 and patch-3 to tree.
> Update:
> apply the difference between patch-2 and tree to patch-3.
Star-merge --three-way:
Do it both ways (since diff3 is a symmetric operation).
Stefan
| [Prev in Thread] | Current Thread | [Next in Thread] |