Changeset 56483 in webkit
- Timestamp:
- Mar 24, 2010 9:15:35 PM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r56478 r56483 1 2010-03-24 David Kilzer <ddkilzer@apple.com> 2 3 <http://webkit.org/b/36570> resolve-ChangeLogs: fall back to git-merge-file if ChangeLog can't be merged 4 5 Reviewed by Eric Seidel. 6 7 * Scripts/resolve-ChangeLogs: Switched to exec git-merge-file if 8 the merge attempt fails. 9 1 10 2010-03-24 Adam Barth <abarth@webkit.org> 2 11 -
trunk/WebKitTools/Scripts/resolve-ChangeLogs
r56471 r56483 134 134 copy($theirs, $ours) or die $!; 135 135 } else { 136 ex it 1;136 exec qw(git merge-file -L THEIRS -L BASE -L OURS), $theirs, $base, $ours; 137 137 } 138 138 } elsif (@changeLogFiles) {
Note: See TracChangeset
for help on using the changeset viewer.