Mercurial > emacs
diff src/uaf.h @ 5768:ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Fri, 04 Feb 1994 01:18:01 +0000 |
parents | 91d20436874c |
children | ac7375e60931 |
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Fri, 04 Feb 1994 01:18:01 +0000 |
parents | 91d20436874c |
children | ac7375e60931 |