diff options
author | Aurelien Foret <aurelien@archlinux.org> | 2006-01-06 22:58:01 +0000 |
---|---|---|
committer | Aurelien Foret <aurelien@archlinux.org> | 2006-01-06 22:58:01 +0000 |
commit | db8a5e358617038b3e884a13462a4f0163b56cc5 (patch) | |
tree | 5645a2e7bdc3d5a404db079689c1bde766a1ce75 /doc/Makefile.am | |
parent | c2b27b58804b9a33a8dd13f62a192f5154416d0d (diff) |
- sync: populates *data when a conflict can't be resolved
- add: code cleanup
Diffstat (limited to 'doc/Makefile.am')
0 files changed, 0 insertions, 0 deletions