equal
deleted
inserted
replaced
82 b"What do you want to do?" |
82 b"What do you want to do?" |
83 b"$$ &Changed $$ &Deleted $$ &Unresolved" |
83 b"$$ &Changed $$ &Deleted $$ &Unresolved" |
84 ) |
84 ) |
85 |
85 |
86 |
86 |
87 class absentfilectx(object): |
87 class absentfilectx: |
88 """Represents a file that's ostensibly in a context but is actually not |
88 """Represents a file that's ostensibly in a context but is actually not |
89 present in it. |
89 present in it. |
90 |
90 |
91 This is here because it's very specific to the filemerge code for now -- |
91 This is here because it's very specific to the filemerge code for now -- |
92 other code is likely going to break with the values this returns.""" |
92 other code is likely going to break with the values this returns.""" |