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.txt | |
| parent | 8a48fa22dc6fe1e78f9e29e0b93eb6105c9f3341 (diff) | |
| download | git-htmldocs-6a3c82713a6d40b17cafd5a3eb312fe7b25d277e.tar.gz | |
Autogenerated HTML docs for v1.6.1-rc3-38-gec9f0
Diffstat (limited to 'git-checkout.txt')
| -rw-r--r-- | git-checkout.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index 79824f481..9cd51514d 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -232,7 +232,6 @@ the `-m` option, you would see something like this: ------------ $ git checkout -m mytopic Auto-merging frotz -merge: warning: conflicts during merge ERROR: Merge conflict in frotz fatal: merge program failed ------------ |