From: Yaroslav Halchenko Date: Fri, 29 Dec 2017 04:41:27 GMT Subject: Re: [PATCH] merge: teach -Xours/-Xtheirs to symbolic link merge Message-ID: <20171229044127.7jwyg7geclsmksw4@hopa.kiewit.dartmouth.edu> In-Reply-To: On Thu, 28 Dec 2017, Elijah Newren wrote: > > Teach a similar trick to the codepath that deals with merging two > > conflicting changes to symbolic links. > Saw this change referenced in the "what's cooking" emails and decided > to review this. The code changes look obviously correct to me, and > the testcase looks good too. > Reviewed-by: Elijah Newren > (and perhaps we should also add in "Tested-by: Yaroslav Halchenko > " ? At least, that was my thought based on > https://public-inbox.org/git/20170926133703.7gtk5ztkhqvfxszh@hopa.kiewit.dartmouth.edu/ > ) I would be honored to wear a badge of the git-tested-by-er! FWIW I can reconfirm, that the patch did work out nicely for me back then Thanks! -- Yaroslav O. Halchenko Center for Open Neuroscience http://centerforopenneuroscience.org Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755 Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419 WWW: http://www.linkedin.com/in/yarik