diff options
Diffstat (limited to 'doc/automatic_conflict_resolution.mdwn')
| -rw-r--r-- | doc/automatic_conflict_resolution.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/automatic_conflict_resolution.mdwn b/doc/automatic_conflict_resolution.mdwn index f20138b19..095cfde7d 100644 --- a/doc/automatic_conflict_resolution.mdwn +++ b/doc/automatic_conflict_resolution.mdwn @@ -17,7 +17,7 @@ you don't want. The "AAA" and "BBB" in the above example are essentially arbitrary (technically they are the MD5 checksum of the key). The automatic merge -conflict resoltuion is designed so that if two or more repositories both get +conflict resolution is designed so that if two or more repositories both get a merge conflict, and resolve it, the resolved repositories will not themselves conflict. This is why it doesn't use something nicer, like perhaps the name of the remote that the file came from. |