Re: [minor BUG] cherry-pick -x doesn't work if a conflict occurs

2011/1/5 Jay Soffian [off-list ref]:

2011/1/5 Uwe Kleine-König [off-list ref]:

quoted

ah, I wonder if this is intended or just documenting a short-coming :-)

I think it's intended as it's no longer the original commit, but

Ah, seems to be a documented short-coming after-all:

  http://thread.gmane.org/gmane.comp.version-control.git/61737/focus=61933

j.