Searched refs:mergeChangeLogs (Results 1 – 5 of 5) sorted by relevance
| /external/webkit/Tools/Scripts/webkitperl/VCSUtils_unittest/ |
| D | mergeChangeLogs.pl | 115 my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
184 my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
241 my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
321 my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
|
| /external/webkit/Tools/Scripts/ |
| D | resolve-ChangeLogs | 132 if (mergeChangeLogs($ours, $base, $theirs)) {
444 if (mergeChangeLogs($fileMine, $fileOlder, $fileNewer)) {
|
| D | VCSUtils.pm | 69 &mergeChangeLogs
1642 sub mergeChangeLogs($$$) subroutine
|
| /external/webkit/Tools/ |
| D | ChangeLog-2010-05-24 | 10940 <http://webkit.org/b/36572> commit-log-editor: thinks mergeChangeLogs.pl is a ChangeLog file
10946 mergeChangeLogs.pl from r56471 and r56472):
11014 mergeChangeLogs() for the previous commit also fixed this, but
11019 (mergeChangeLogs): Added --force switch to patch command. Also
11022 * Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl: Added
11032 (mergeChangeLogs): Copied from mergeChanges() in
11038 mergeChangeLogs().
11040 mergeChangeLogs().
11041 * Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl: Added.
|
| D | ChangeLog-2011-02-16 | 17315 - Modified call site in mergeChangeLogs() as necessary.
|