diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-07-12 14:14:18 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-07-12 14:14:18 +0000 |
| commit | f2d3a37e34b547812b378f4079788d732c3f5e1f (patch) | |
| tree | 81e83775157e66dc8f65449e5e071b476e44e073 /git-checkout.html | |
| parent | d00c92a56a10f6677c65bae224997d9a2d5af2eb (diff) | |
| download | git-htmldocs-f2d3a37e34b547812b378f4079788d732c3f5e1f.tar.gz | |
Autogenerated HTML docs for v1.7.2-rc2-8-g609e
Diffstat (limited to 'git-checkout.html')
| -rw-r--r-- | git-checkout.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-checkout.html b/git-checkout.html index e7173dcac..51fbac4b8 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -676,7 +676,7 @@ the above checkout would fail like this:</p></div> <div class="listingblock">
<div class="content">
<pre><tt>$ git checkout mytopic
-fatal: Entry 'frotz' not uptodate. Cannot merge.</tt></pre>
+error: You have local changes to 'frotz'; not switching branches.</tt></pre>
</div></div>
<div class="para"><p>You can give the <tt>-m</tt> flag to the command, which would try a
three-way merge:</p></div>
@@ -727,7 +727,7 @@ $ git add frotz</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-06-21 15:23:40 UTC
+Last updated 2010-07-12 14:14:04 UTC
</div>
</div>
</body>
|