Mercurial > hg-website
diff text/workflows.txt @ 126:9655e0018355
Added a resolve part for merging.
author | Arne Babenhauserheide <bab@draketo.de> |
---|---|
date | Fri, 01 May 2009 13:51:27 +0200 |
parents | f67bc89db328 |
children | ac97975760a7 |
author | Arne Babenhauserheide <bab@draketo.de> |
---|---|
date | Fri, 01 May 2009 13:51:27 +0200 |
parents | f67bc89db328 |
children | ac97975760a7 |