⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⢠⣴⣿⣿⣿⣷⣼⣿⠀⣴⠾⠷⠶⠦⡄⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⢠⡤⢶⣦⣾⣿⣿⣿⣿⣿⣿⣿⠀⣿⣶⣶⣦⣄⠳⣤⣤⠄⠀⠀⠀ ⠀⠀⠀⢀⣼⣳⡿⢻⣿⣿⣿⣿⣿⣿⣿⣿⣶⣿⣿⣗⠈⠙⠻⣶⣄⡀⠀⠀⠀ ⠀⠀⠀⣰⠿⠁⢀⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡄⠀⠀⠈⠳⣤⠀⠀ ⠀⠀⢀⡟⠀⢰⣿⠟⠻⢿⣿⣿⣿⣿⣿⣿⣿⣿⠉⠁⠈⠻⣶⣄⠀⠀⠈⠛⢦ ⠀⣀⡼⠃⠀⣼⡟⠀⠀⢸⣿⡿⠉⣿⡿⠿⠛⣿⡄⠀⠀⠀⠙⠿⣆⠀⠀⠀⠈ ⠈⠁⠀⠀⢸⡟⠀⠀⠀⢸⣿⠀⠀⣿⠁⠀⠀⠈⠃⠀⠀⠀⠀⠀⠘⢷⡄⠀⠀ ⠀⠀⠀⠀⣼⠃⠀⠀⠀⢸⡟⠀⠀⡿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⡆⠀ ⠀⠀⠀⣠⡏⠀⠀⠀⠀⣼⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠻⠃⠀⠀⠀⠀⣻⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠻⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ Current Dir: /usr/libexec/git-core/mergetools/ [FILE] araxis [ edit | delete | rename | download ] [FILE] bc3 [ edit | delete | rename | download ] [FILE] codecompare [ edit | delete | rename | download ] [FILE] deltawalker [ edit | delete | rename | download ] [FILE] diffuse [ edit | delete | rename | download ] [FILE] ecmerge [ edit | delete | rename | download ] [FILE] emerge [ edit | delete | rename | download ] [FILE] gvimdiff [ edit | delete | rename | download ] [FILE] gvimdiff2 [ edit | delete | rename | download ] [FILE] kdiff3 [ edit | delete | rename | download ] [FILE] kompare [ edit | delete | rename | download ] [FILE] meld [ edit | delete | rename | download ] [FILE] opendiff [ edit | delete | rename | download ] [FILE] tkdiff [ edit | delete | rename | download ] [FILE] tortoisemerge [ edit | delete | rename | download ] [FILE] vimdiff [ edit | delete | rename | download ] [FILE] vimdiff2 [ edit | delete | rename | download ] [FILE] xxdiff [ edit | delete | rename | download ] Viewing: /usr/libexec/git-core/mergetools/codecompare 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 }