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 Homebrew/homebrew#27042.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
josmo 2014-02-26 14:28:19 -08:00 committed by Jack Nagel
parent 1a2fd4dd5b
commit 18c521c846

15
Formula/git-imerge.rb Normal file
View file

@ -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