Junio C Hamano <junkio@cox.net> writes: > Linus Torvalds <torvalds@osdl.org> writes: > >> On Tue, 29 Nov 2005, Junio C Hamano wrote: >>> >>> I have actually resolved one conflicting merge with this and it >>> was OK, except that it was a bit unpleasant when I first did >>> "git-diff-index HEAD" without giving any path ;-), >> >> What does "git-diff-files" do? Just output a lot of nasty "unmerged" >> messages? > > That was not what was unpleasant. What was unpleasant was those > "unmerged" messages were buried under heap of normal diffs, > showing the successfully merged entries as the result of merge. > > I am inclined to munge your patch to do this: This I have done, and pushed out to "pu" for tonight. After doing some more test I'll have this graduate to "master" sometime tomorrow along with other accumulated changes. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Wed Nov 30 20:06:31 2005
This archive was generated by hypermail 2.1.8 : 2005-11-30 20:06:42 EST