| 메소드 | 설명 | |
|---|---|---|
| changesOnAdjacentLinesMergeWithoutConflict ( string $driver ) | ||
| conflictingContentsCreatedConflict ( string $driver ) | Creates two branches with a conflict in content. Asserts that dates are merged automatically but the content conflicts. | |
| driverProvider ( ) | ||
| gitAttributesIsSameAfterInstallAndUninstall ( ) | ||
| gitAttributesRemovedCorrectlyAfterUninstall ( ) | ||
| gitAttributesRemovedWhenEmpty ( ) | ||
| mergeDriverInstalledCorrectly ( ) | ||
| mergeDriverIsNotAddedWhenPresent ( ) | ||
| mergeDriverUninstalledCorrectly ( ) | ||
| mergedDatesWithoutConflict ( string $driver ) | Creates two branches differing only in the date modified (and the GMT version of it). | |
| setUp ( ) | ||
| setUpBeforeClass ( ) | ||
| tearDown ( ) |
| 메소드 | 설명 | |
|---|---|---|
| installMergeDriver ( string $driver ) |
| public changesOnAdjacentLinesMergeWithoutConflict ( string $driver ) | ||
| $driver | string | |
| public conflictingContentsCreatedConflict ( string $driver ) | ||
| $driver | string | |
| public gitAttributesIsSameAfterInstallAndUninstall ( ) |
| public gitAttributesRemovedCorrectlyAfterUninstall ( ) |
| public mergedDatesWithoutConflict ( string $driver ) | ||
| $driver | string | |