From: Steven Grimm <koreth@midwinter.com>
Date: Mon, 20 Aug 2007 03:36:38 +0000 (+0800)
Subject: Document what the stage numbers in the :$n:path syntax mean.
X-Git-Tag: v1.5.3-rc6~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/257a84d9d02e90447b149af58b271c19405edb6a?hp=257a84d9d02e90447b149af58b271c19405edb6a

Document what the stage numbers in the :$n:path syntax mean.

The git-rev-parse manpage talks about the :$n:path notation (buried deep in
a list of other syntax) but it just says $n is a "stage number" -- someone
who is not familiar with the internals of git's merge implementation is
never going to be able to figure out that "1", "2", and "3" means.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---