Home » Mailing list archives » git » 2006 » October » 18

Re: [PATCH] Use diff3 instead of merge in merge-recursive.

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Jakub Narebski <jnareb@...>
To: <git@...>
Subject: Re: [PATCH] Use diff3 instead of merge in merge-recursive.
Date: Wednesday, October 18, 2006 - 5:35 am

Uwe Zeisberger wrote:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
Re: [PATCH] Use diff3 instead of merge in merge-recursive., Jakub Narebski, (Wed Oct 18, 5:35 am)
Re: [PATCH] Use diff3 instead of merge in merge-recursive., Linus Torvalds, (Wed Oct 18, 11:53 am)
Re: [PATCH] Use diff3 instead of merge in merge-recursive., Daniel Barkalow, (Thu Oct 19, 2:31 am)
Re: [PATCH] Use diff3 instead of merge in merge-recursive., Johannes Schindelin, (Wed Oct 18, 6:04 am)