Re: [PATCH v3 00/13] fix mergetool+rerere+subdir regression

On Sun, Jan 8, 2017 at 9:42 PM, Richard Hansen [off-list ref] wrote:

If rerere is enabled, no pathnames are given, and mergetool is run
from a subdirectory, mergetool always prints "No files need merging".
Fix the bug.

This regression was introduced in
57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0).

Changes since v2:
  * Added entries to .mailmap.
  * Patch 2/4 was split into multiple separate commits.
  * Moved '-O' out of $orderfile.
  * $orderfile is now adjusted after running cd_to_toplevel.
  * Added lots of comments.
  * Other minor tweaks to address review feedback.

The changes to tests look all good to me.

Thanks,
Stefan