forked from felipec/git
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Code Compare v2.80.4 as a merge / diff tool for Windows
Code Compare is a commercial file comparison tool for Windows, see http://www.devart.com/codecompare/ Version 2.80.4 added support for command line arguments preceded by a dash instead of a slash. This is required for Git for Windows because slashes in command line arguments get mangled with according to these rules: http://www.mingw.org/wiki/Posix_path_conversion Signed-off-by: Sebastian Schuberth <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
- Loading branch information
1 parent
7a30747
commit 755e8b3
Showing
3 changed files
with
27 additions
and
2 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
diff_cmd () { | ||
"$merge_tool_path" "$LOCAL" "$REMOTE" | ||
} | ||
|
||
merge_cmd () { | ||
touch "$BACKUP" | ||
if $base_present | ||
then | ||
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \ | ||
-RF="$MERGED" | ||
else | ||
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \ | ||
-RF="$MERGED" | ||
fi | ||
check_unchanged | ||
} | ||
|
||
translate_merge_tool_path() { | ||
if merge_mode | ||
then | ||
echo CodeMerge | ||
else | ||
echo CodeCompare | ||
fi | ||
} |