mergetools / gvimdiff2on commit am: move advice.amWorkDir parsing back to advice.c (431bb23)
   1. "$MERGE_TOOLS_DIR/vimdiff"