diff options
| author | josmo | 2014-02-26 14:28:19 -0800 |
|---|---|---|
| committer | Jack Nagel | 2014-05-18 23:18:58 -0500 |
| commit | 57c70335a4b8c27db02556caf45a5decbbd7259a (patch) | |
| tree | 025d3d2e5f22755c0837438f74a00af4c7222b56 /Library/Formula | |
| parent | 660aa8d5cbeae37fbcbdbcef45387f086f476cdd (diff) | |
| download | homebrew-57c70335a4b8c27db02556caf45a5decbbd7259a.tar.bz2 | |
New formula for git-imerge
git-imerge performs a merge between two branches incrementally. If
conflicts are encountered, figure out exactly which pairs of commits
conflict, and present the user with one pairwise conflict at a time for
resolution.
Closes #27042.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/git-imerge.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Library/Formula/git-imerge.rb b/Library/Formula/git-imerge.rb new file mode 100644 index 000000000..dcc80a922 --- /dev/null +++ b/Library/Formula/git-imerge.rb @@ -0,0 +1,15 @@ +require "formula" + +class GitImerge < Formula + homepage "https://github.com/mhagger/git-imerge" + url "https://github.com/mhagger/git-imerge/archive/0.7.0.tar.gz" + sha1 "b3bab94743a79426ea79c1b5e503020ef7fbf2ec" + + def install + bin.install "git-imerge" + end + + test do + system "#{bin}/git-imerge", "-h" + end +end |