X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-file.txt;h=d7db2a3737fbdb032747bc6dd2740be1a56dfced;hb=a452d148d10a89ae502bc4755c191ab323227ce5;hp=635c66956e90452c58938f2d48e84454983f22e6;hpb=ac39c5f554f80b5baddea9a6e6b5ff53cb92b6e3;p=git.git diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index 635c66956..d7db2a373 100644 --- a/Documentation/git-merge-file.txt +++ b/Documentation/git-merge-file.txt @@ -76,12 +76,12 @@ OPTIONS EXAMPLES -------- -git merge-file README.my README README.upstream:: +`git merge-file README.my README README.upstream`:: combines the changes of README.my and README.upstream since README, tries to merge them and writes the result into README.my. -git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345:: +`git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345`:: merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels `a` and `c` instead of `tmp/a123` and `tmp/c345`.