| commit | 7d904d49dbc2e286be476d84ec649234d5d67f74 | |
| author | Calvin Spealman <ironfroggy@ironfroggy.socialserve.com> | |
| Mon, 12 Nov 2007 14:33:29 +0000 (12 09:33 -0500) | ||
| committer | Calvin Spealman <ironfroggy@ironfroggy.socialserve.com> | |
| Mon, 12 Nov 2007 14:33:29 +0000 (12 09:33 -0500) | ||
| tree | d82554cd856304194d08530f0c5b3fb925938333 | treesnapshot (tar.gz zip) |
| parent | 4501cd8f69d44a20140e8ac1891943ae0f41da79 | commitdiff |
Rename endbranch to mergebranch and dont delete after merge. It shouldn't need to be implicit, because it is safer now than before to merge and keeping working. We are also making sure updates are clean before merging is allowed to continue.
| endbranch | [deleted file] | blobblamehistory |
| mergebranch | [new file with mode: 0644] | blob |