About Donald

A simple vim based merge tool for git users. Use this gem when a git conflict happens and it will open all conflicted files using vim (one file by tab).

Installation:

sudo gem sources -a http://gemcutter.org
sudo gem install donald

Usage:

donald

Options:

-g or —gvim

Open files using gvim

Example:

donald -g

-m or —mvim

Open files using mvim

—vim

Open files using vim

-t or —textmate

Open files using Textmate

Setting up your default text editor

Set the $EDITOR variable in your ~/.bashrc file

Example:

export EDITOR="mate"

Searching for conflicts

If you are using vim just type “n” to go to the next conflict.

License

(The MIT License)

Copyright © 2010

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.