diff options
Diffstat (limited to '')
| -rw-r--r-- | third_party/git/mergetools/bc | 5 | ||||
| -rw-r--r-- | third_party/git/mergetools/bc3 | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/third_party/git/mergetools/bc b/third_party/git/mergetools/bc index 3a69e60faa..a89086ee72 100644 --- a/third_party/git/mergetools/bc +++ b/third_party/git/mergetools/bc @@ -21,3 +21,8 @@ translate_merge_tool_path() { echo bcompare fi } + +list_tool_variants () { + echo bc + echo bc3 +} diff --git a/third_party/git/mergetools/bc3 b/third_party/git/mergetools/bc3 deleted file mode 100644 index 5d8dd48184..0000000000 --- a/third_party/git/mergetools/bc3 +++ /dev/null @@ -1 +0,0 @@ -. "$MERGE_TOOLS_DIR/bc" |