- Committer: Canonical.com Patch Queue Manager
- Date: 2008-03-11 16:33:01 UTC
- mfrom: (3144.6.2 doc-update)
- Revision ID: pqm@pqm.ubuntu.com-20080311163301-ckw6hxe1rwahhgrt
Update LCA merge document to mention exception to 3-way behavior
(abentley)
(abentley)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bzrlib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
contrib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
doc
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
man1
|
2425.1.1 | 17 years ago | Robert Collins | ``make docs`` now creates a man page at ``man1/bzr |
|
||
|
tools
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
.bzrignore |
3224.1.1 | 16 years ago | John Arbash Meinel | ignore .dll for cygwin | 893 bytes |
|
|
|
.rsyncexclude |
1185.33.36 | 19 years ago | Martin Pool | Exclude more files from dumb-rsync upload | 203 bytes |
|
|
|
BRANCH.TODO |
2399.1.16 | 17 years ago | John Arbash Meinel | [merge] bzr.dev 2466 | 150 bytes |
|
|
bzr |
3193.6.8 | 16 years ago | Alexander Belchenko | merge bzr.dev; update for 1.3; $BZR_LOG used in tr | 4.1 KB |
|
|
|
bzr.ico |
1861.2.16 | 18 years ago | Alexander Belchenko | new official bzr.ico | 7.2 KB |
|
|
|
COPYING.txt |
1861.2.9 | 18 years ago | Alexander Belchenko | rename gpl.txt => COPYING.txt | 17.5 KB |
|
|
|
generate_docs.py |
2911.6.1 | 17 years ago | Blake Winton | Change 'print >> f,'s to 'f.write('s. | 2.9 KB |
|
|
|
INSTALL |
2696.2.4 | 17 years ago | Aaron Bentley | Fix typo | 1.4 KB |
|
|
|
Makefile |
3089.3.14 | 17 years ago | Ian Clatworthy | follow-up tweaks to bzr.dev integration | 6.5 KB |
|
|
|
NEWS |
3262 | 16 years ago | Canonical.com Patch Queue Manager | Make Tree.iter_changes a public method (abentley) | 213 KB |
|
|
|
profile_imports.py |
1996.3.36 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2070 | 5.4 KB |
|
|
|
README |
3163.1.1 | 16 years ago | Martin Pool | README ReST syntax fix | 3.2 KB |
|
|
|
setup.py |
3193.7.11 | 16 years ago | Alexander Belchenko | merge bzr.dev; update patch for 1.3 | 11.9 KB |
|
|
|
TODO |
2382.2.5 | 17 years ago | Martin Pool | Contents of TODO file moved into bug tracker | 115 bytes |
|
|