Class
Grit::Merge
In:
lib/grit/merge.rb
Parent:
Object
Methods
inspect
new
Constants
STATUS_BOTH
=
'both'
STATUS_OURS
=
'ours'
STATUS_THEIRS
=
'theirs'
Attributes
conflicts
[R]
sections
[R]
text
[R]
Public Class methods
new
(str)
Public Instance methods
inspect
()
Pretty object inspection
[Validate]