← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1185.12.89 to 1185.12.70

expand all expand all

Rev   Summary Authors Date Diff Files
1185.12.89
Improved sort order of indirect merges
Aaron Bentley 19 years ago Diff Files
1185.12.88
Added weave merge conflict to ExceptionConflictHandler
Aaron Bentley 19 years ago Diff Files
1185.12.87
Updated NEWS, error out if --show-base supplied and unsuppor...
Aaron Bentley 19 years ago Diff Files
1185.12.86
Switched to standard 7-char conflict markers
Aaron Bentley 19 years ago Diff Files
1185.12.85
Added conflict handling for weave merges
Aaron Bentley 19 years ago Diff Files
1185.12.84
got merge type selection under test
Aaron Bentley 19 years ago Diff Files
1185.12.83
Preliminary weave merge support
Aaron Bentley 19 years ago Diff Files
1185.12.82
Fix missing import
Aaron Bentley 19 years ago Diff Files
1185.12.81
Restored merge type selection
Aaron Bentley 19 years ago Diff Files
1185.12.80
Added mode preservation to AtomicFile
Aaron Bentley 19 years ago Diff Files
1185.12.79
Fixed double-reporting of pending merges
Aaron Bentley 19 years ago Diff Files
1185.12.78
Show indirect merges in status
Aaron Bentley 19 years ago Diff Files
1185.12.77
Prevented all ancestors from being marked as pending merges
Aaron Bentley 19 years ago Diff Files
1185.12.76
Refactored merge and merge_inner to use Merger
Aaron Bentley 19 years ago Diff Files
1185.12.75
Introduced transform_tree
Aaron Bentley 19 years ago Diff Files
1185.12.74
Cleanup of merge.py
Aaron Bentley 19 years ago Diff Files
1185.12.73
Merge Martin's latest
Aaron Bentley 19 years ago Diff Files
1185.12.72
Merged Robert Collins
Aaron Bentley 19 years ago Diff Files
1185.12.71
Merge3 cleanups
Aaron Bentley 19 years ago Diff Files
1185.12.70
Removed b
Aaron Bentley 19 years ago Diff Files