diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-12-19 21:38:18 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-12-19 21:38:18 +0000 |
| commit | 6a3c82713a6d40b17cafd5a3eb312fe7b25d277e (patch) | |
| tree | 47aa90c293a5f91167ef11d827b0a24a69a29507 /git-checkout.html | |
| parent | 8a48fa22dc6fe1e78f9e29e0b93eb6105c9f3341 (diff) | |
| download | git-htmldocs-6a3c82713a6d40b17cafd5a3eb312fe7b25d277e.tar.gz | |
Autogenerated HTML docs for v1.6.1-rc3-38-gec9f0
Diffstat (limited to 'git-checkout.html')
| -rw-r--r-- | git-checkout.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-checkout.html b/git-checkout.html index c25625af8..ab2afa8bf 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -612,7 +612,6 @@ the <tt>-m</tt> option, you would see something like this: <div class="content">
<pre><tt>$ git checkout -m mytopic
Auto-merging frotz
-merge: warning: conflicts during merge
ERROR: Merge conflict in frotz
fatal: merge program failed</tt></pre>
</div></div>
@@ -642,7 +641,7 @@ $ git add frotz</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-12-18 08:44:16 UTC
+Last updated 2008-12-19 21:37:55 UTC
</div>
</div>
</body>
|