Thread (30 messages) flat view 30 messages, 5 authors, 2016-06-15

Re: [PATCH] An attempt to resolve a rename/rename conflict in recursive merge

From: Alex Riesen <hidden>
Date: 2016-06-15 22:43:02

Alex Riesen, Fri, Mar 30, 2007 01:01:56 +0200:
I just left all three entries in the index for the virtual commit to
pick them up: it'll usually(always?) generate a conflict which has to
be resolved manually. Many times, perhaps.
Nah, doesn't do anything good. Does not crash, though.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help