Mercurial > hg > Aquinas
diff summa/bilingual/merge.el @ 69:52063d0f8985
modified to work in merge.xpl
| author | ht |
|---|---|
| date | Sun, 03 Jan 2010 18:46:39 +0000 |
| parents | 9c8612174a28 |
| children |
| author | ht |
|---|---|
| date | Sun, 03 Jan 2010 18:46:39 +0000 |
| parents | 9c8612174a28 |
| children |