equal
deleted
inserted
replaced
457 perform a merge manually. If the file to be merged is named |
457 perform a merge manually. If the file to be merged is named |
458 ``a.txt``, these files will accordingly be named ``a.txt.local``, |
458 ``a.txt``, these files will accordingly be named ``a.txt.local``, |
459 ``a.txt.other`` and ``a.txt.base`` and they will be placed in the |
459 ``a.txt.other`` and ``a.txt.base`` and they will be placed in the |
460 same directory as ``a.txt``. |
460 same directory as ``a.txt``. |
461 |
461 |
462 This implies permerge. Therefore, files aren't dumped, if premerge |
462 This implies premerge. Therefore, files aren't dumped, if premerge |
463 runs successfully. Use :forcedump to forcibly write files out. |
463 runs successfully. Use :forcedump to forcibly write files out. |
464 """ |
464 """ |
465 a = _workingpath(repo, fcd) |
465 a = _workingpath(repo, fcd) |
466 fd = fcd.path() |
466 fd = fcd.path() |
467 |
467 |