mergetools / gvimdiff2on commit Merge branch 'nb/gnome-keyring-build' (880c267)
   1. "$MERGE_TOOLS_DIR/vimdiff"