diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-30 18:06:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-30 18:06:39 -0800 |
| commit | e634aec752642dcf86c3fc82025e43381d6768c2 (patch) | |
| tree | a589b6756894d18c841ac61499e5d2c9beda36fd /Documentation/git-resolve.txt | |
| parent | a1c7a69047e88244ed321b5aa2a8bcbba5a869c2 (diff) | |
| parent | 80e0c0ab91e1cf6a6315d0431bf6873ebbf8bef0 (diff) | |
| download | git-e634aec752642dcf86c3fc82025e43381d6768c2.tar.gz | |
GIT 0.99.9av0.99.9a
... to contain the RPM workaround.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-resolve.txt')
| -rw-r--r-- | Documentation/git-resolve.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt index 7d3eb79033..4e57c2b287 100644 --- a/Documentation/git-resolve.txt +++ b/Documentation/git-resolve.txt @@ -1,6 +1,5 @@ git-resolve(1) ============== -v0.99.5, Aug 2005 NAME ---- @@ -9,7 +8,7 @@ git-resolve - Merge two commits SYNOPSIS -------- -'git resolve' <current> <merged> <message> +'git-resolve' <current> <merged> <message> DESCRIPTION ----------- |