Mercurial > emacs
comparison m4/getopt.m4 @ 108947:ca556d6b7c7a
Conflict resolution fixup
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Thu, 10 Jun 2010 00:34:08 +0200 |
| parents | 4ad431d8e164 |
| children | ef719132ddfa babd014aab81 |
comparison
equal
deleted
inserted
replaced
| 108946:d418516def73 | 108947:ca556d6b7c7a |
|---|