diff tests/test-simplemerge.py.out @ 19967:e92c6524a76d stable

largefiles: use 'remote'/'local' in merge prompts like in other merge prompts Prompts like foo has been turned into a largefile use (l)argefile or keep as (n)ormal file? was not as clear as the usual prompts that use 'remote' or 'local' to explain what happened on which side ... especially not when used to the normal prompts. "as" could also indicate that it would be possible to take the content of the largefile and somehow put it into the normal file. It could make it more clear that it was a choice between one side or the other. For consistency we will now phrase it like: remote turned local normal file f into a largefile use (l)argefile or keep (n)ormal file?
author Mads Kiilerich <madski@unity3d.com>
date Mon, 28 Oct 2013 22:34:07 +0100
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line diff