mergetools / gvimdiffon commit subtree: make --ignore-joins pay attention to adds (dd21d43)
   1. "$MERGE_TOOLS_DIR/vimdiff"