Created
February 19, 2012 03:44
-
-
Save thenigan/1861841 to your computer and use it in GitHub Desktop.
DeltaWalker config file for git diff and merge
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff_cmd () { | |
| "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 | |
| } | |
| merge_cmd () { | |
| if $base_present | |
| then | |
| "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" "$MERGED" >/dev/null 2>&1 | |
| status=$? | |
| else | |
| status=1 | |
| fi | |
| } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment