Skip to content
Snippets Groups Projects
Commit 0e5dfc26 authored by Jean-Noël Avila's avatar Jean-Noël Avila
Browse files

Merge changes in original manpages

parent 13daaa66
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
en/git-add.txt
+ 2
− 2
View file @ 0e5dfc26
en/git-am.txt
+ 0
− 1
View file @ 0e5dfc26
...@@ -26,7 +26,6 @@ current branch. ...@@ -26,7 +26,6 @@ current branch.
OPTIONS OPTIONS
------- -------
(<mbox>|<Maildir>)...:: (<mbox>|<Maildir>)...::
The list of mailbox files to read patches from. If you do not The list of mailbox files to read patches from. If you do not
supply this argument, the command reads from the standard input. supply this argument, the command reads from the standard input.
......
en/mergetools-merge.txt
+ 1
− 0
View file @ 0e5dfc26
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
* ecmerge * ecmerge
* emerge * emerge
* examdiff * examdiff
* guiffy
* gvimdiff * gvimdiff
* gvimdiff2 * gvimdiff2
* gvimdiff3 * gvimdiff3
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr