fuzzykiller

#!/bin/bash
#
# Purpose: manually associate missed renames in merge conflicts
#
# Usage: git merge-associate <our-target> <base> <theirs>
#
# Example: After a failed rename detection A/a -> B/b which results
# in CONFLICT (delete/modify) for A/a and corresponding "deleted by us"
# messages in git status, the following invocation can be used to manually
# establish the link:

fuzzykiller

/**
 * Created by azu.
 * Date: 10/11/28
 * Updated by fuzzykiller (2015/08/28)
 * License: MIT License
 */

/**
 * An object that exposes various information about Greasemonkey and the running User Script.
 */