projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
binary diff and apply: testsuite.
[git.git]
/
Documentation
/
git-merge-index.txt
diff --git
a/Documentation/git-merge-index.txt
b/Documentation/git-merge-index.txt
index
fbc986a
..
332e023
100644
(file)
--- a/
Documentation/git-merge-index.txt
+++ b/
Documentation/git-merge-index.txt
@@
-8,7
+8,7
@@
git-merge-index - Runs a merge for files needing merging
SYNOPSIS
--------
SYNOPSIS
--------
-'git-merge-index' [-o] [-q] <merge-program> (-a | -- | <file>\*)
+'git-merge-index' [-o] [-q] <merge-program> (-a |
\
-- | <file>\*)
DESCRIPTION
-----------
DESCRIPTION
-----------
@@
-19,7
+19,7
@@
files are passed as arguments 5, 6 and 7.
OPTIONS
-------
OPTIONS
-------
---::
+
\
--::
Do not interpret any more arguments as options.
-a::
Do not interpret any more arguments as options.
-a::