added merging functions
commitb81ee9305f418209ba0d77fbb7b47b23d4b121ca
authorscott Chacon <schacon@agadorsparticus.(none)>
Sun, 11 Nov 2007 22:37:05 +0000 (11 14:37 -0800)
committerscott Chacon <schacon@agadorsparticus.(none)>
Sun, 11 Nov 2007 22:37:05 +0000 (11 14:37 -0800)
treef4bef02a3befcbe06be85ff8507cb18242df5f40
parentabcb1453e210beb6de70a69d3501cf842b38636e
added merging functions
EXAMPLES
lib/git/base.rb
lib/git/branch.rb
lib/git/lib.rb
tests/units/test_branch.rb
tests/units/test_merge.rb [new file with mode: 0644]