diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-27 16:03:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-27 16:03:42 -0400 |
| commit | 054ddda18a48abce03a1c0b50aef4eed714aa320 (patch) | |
| tree | 1099572c496b87035d90f775912e61c52ced2d96 /doc/special_remotes.mdwn | |
| parent | 9147ad74931222f05b76102bfea61b1fe177fd32 (diff) | |
better filenames for conflict resolution files
Diffstat (limited to 'doc/special_remotes.mdwn')
0 files changed, 0 insertions, 0 deletions