diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-02-05 15:59:42 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-02-05 15:59:42 -0500 |
| commit | f92505d78b82c6ac146e43054ebd12441575a602 (patch) | |
| tree | 2897a21c04f473ee3100a6a59ccce6336a1f7692 /doc/rcs/details.mdwn | |
| parent | fbe2ab4419e086ff84991bf25f1549aaabc5143b (diff) | |
| parent | 11f4942d68f3276bfdc4688e4091e559f9481874 (diff) | |
Merge branch 'master' into prefix-directives
Diffstat (limited to 'doc/rcs/details.mdwn')
| -rw-r--r-- | doc/rcs/details.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn index 6b9ffb91f..449e129bd 100644 --- a/doc/rcs/details.mdwn +++ b/doc/rcs/details.mdwn @@ -352,3 +352,5 @@ merge again with a merger that inserts conflict markers. It commits this new revision with conflict markers to the repository. It then returns the text to the user for cleanup. This is less neat than it could be, in that a conflict marked revision gets committed to the repository. + +## [[bzr]] |