Re: [PATCH v2] merge-tree: fix typo in both changed identically

2013-04-28 Thread Junio C Hamano
Thanks, both. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH v2] merge-tree: fix typo in both changed identically

2013-04-27 Thread John Keeping
Commit aacecc3 (merge-tree: don't print entries that match local - 2013-04-07) had a typo causing the same in both check to be incorrect and check if both the base and their versions are removed instead of checking that both the our and their versions are removed. Fix this. Reported-by: René