diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-12-10 08:35:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-12-10 08:35:25 +0000 |
| commit | ec87f52676ecc7be43d1d7740a679a42b3192a01 (patch) | |
| tree | b8f74c54892b5aab6da3073eafc5216d05a2c174 /git-merge-file.txt | |
| parent | b4028862764a27387da066ed28437f51376835cd (diff) | |
| download | git-htmldocs-ec87f52676ecc7be43d1d7740a679a42b3192a01.tar.gz | |
Autogenerated HTML docs for v1.6.1-rc2-14-g5363d
Diffstat (limited to 'git-merge-file.txt')
| -rw-r--r-- | git-merge-file.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-merge-file.txt b/git-merge-file.txt index 024ec015a..303537357 100644 --- a/git-merge-file.txt +++ b/git-merge-file.txt @@ -15,17 +15,17 @@ SYNOPSIS DESCRIPTION ----------- -'git-file-merge' incorporates all changes that lead from the `<base-file>` +'git-merge-file' incorporates all changes that lead from the `<base-file>` to `<other-file>` into `<current-file>`. The result ordinarily goes into `<current-file>`. 'git-merge-file' is useful for combining separate changes to an original. Suppose `<base-file>` is the original, and both -`<current-file>` and `<other-file>` are modifications of `<base-file>`. -Then 'git-merge-file' combines both changes. +`<current-file>` and `<other-file>` are modifications of `<base-file>`, +then 'git-merge-file' combines both changes. A conflict occurs if both `<current-file>` and `<other-file>` have changes in a common segment of lines. If a conflict is found, 'git-merge-file' -normally outputs a warning and brackets the conflict with <<<<<<< and ->>>>>>> lines. A typical conflict will look like this: +normally outputs a warning and brackets the conflict with lines containing +<<<<<<< and >>>>>>> markers. A typical conflict will look like this: <<<<<<< A lines in file A @@ -60,7 +60,7 @@ OPTIONS `<current-file>`. -q:: - Quiet; do not warn about conflicts. + Quiet; do not warn about conflicts. EXAMPLES |