- Committer: Vincent Ladeuil
- Date: 2010-01-20 16:31:24 UTC
- mfrom: (4869.3.34 per-file-merge-hook)
- Revision ID: v.ladeuil+lp@free.fr-20100120163124-fhf3nh8e1nu7w3y7
Implement a per-file merge hook
| 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 |
4679.3.76 | 15 years ago | John Arbash Meinel | Rename StaticTupleInterner => SimpleSet. This is | 1.2 KB |
|
|
|
.rsyncexclude |
1185.33.36 | 19 years ago | Martin Pool | Exclude more files from dumb-rsync upload | 203 bytes |
|
|
|
BRANCH.TODO |
4325.3.4 | 15 years ago | Johan Walles | Merge from upstream. | 150 bytes |
|
|
bzr |
4899.1.1 | 14 years ago | John Arbash Meinel | merge the 2.0.4 branch into 2.1.0b5 | 5.6 KB |
|
|
|
bzr.ico |
3688.3.3 | 16 years ago | John Arbash Meinel | An updated transparent icon for bzr. | 12.7 KB |
|
|
|
COPYING.txt |
1861.2.9 | 18 years ago | Alexander Belchenko | rename gpl.txt => COPYING.txt | 17.5 KB |
|
|
|
INSTALL |
2696.2.4 | 17 years ago | Aaron Bentley | Fix typo | 1.4 KB |
|
|
|
Makefile |
4927.2.9 | 14 years ago | Ian Clatworthy | Remove old bzr_man.html generation as no longer co | 14.9 KB |
|
|
|
MANIFEST.in |
4634.125.2 | 14 years ago | John Arbash Meinel | Update the MANIFEST.in file. | 118 bytes |
|
|
|
NEWS |
4973.1.1 | 14 years ago | Vincent Ladeuil | Implement a per-file merge hook | 425 KB |
|
|
|
profile_imports.py |
4183.7.1 | 15 years ago | Sabin Iacob | update FSF mailing address | 5.5 KB |
|
|
|
README |
4634.65.1 | 15 years ago | Ian Clatworthy | update for 2.0 | 2.2 KB |
|
|
|
README_BDIST_RPM |
4634.125.1 | 14 years ago | Joe Julian | Added MANIFEST.in to allow bdist_rpm to have all t | 397 bytes |
|
|
|
setup.py |
4949.1.1 | 14 years ago | Martin Pool | merge 2.0 back to trunk | 26.5 KB |
|
|
|
TODO |
2382.2.5 | 17 years ago | Martin Pool | Contents of TODO file moved into bug tracker | 115 bytes |
|
|