![]() ![]() ![]() * The name `"extMerge"` can be whatever you want. * For best results, refer to the documentation of your merge tool, as it may require different command arguments. You may also replace this with the path to your merge tool directly. This assumes your merge tool was installed and the command is recognized by your system. * `"extMergeTool"` is the merge tool you are invoking. In this file, you will want to add information about your merge tool, it should look something like this:Ĭmd = extMergeTool "$BASE" "$LOCAL" "$REMOTE" "$MERGED" In your home directory, open (or create) the git configuration file. The first step is to configure git so that it knows how to invoke your merge tool. If you have your own merge tool that you would like to use, such as Kaleidoscope or p4merge, you can configure ungit to use it by following these steps:
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |