Mercurial > hg > octave-lyh > gnulib-hg
changeset 9694:6a8d9b9a5d7c
Specify custom merge drivers.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 11 Feb 2008 13:27:09 +0100 |
parents | 2e591b4ebd0d |
children | abc803d0356b |
files | .gitattributes ChangeLog |
diffstat | 2 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff