diff options
| author | Ryan Anderson <ryan@michonline.com> | 2006-07-04 01:30:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-04 01:41:58 (GMT) |
| commit | f560069bc59e155c3078ba5482ce69ded68849df (patch) | |
| tree | 06678b86934aeb1c167ef7ea9308a2d9452132b1 /git-merge-resolve.sh | |
| parent | 12f6c308d53509dcb11e309604457d21d60438db (diff) | |
| download | git-f560069bc59e155c3078ba5482ce69ded68849df.zip git-f560069bc59e155c3078ba5482ce69ded68849df.tar.gz git-f560069bc59e155c3078ba5482ce69ded68849df.tar.bz2 | |
annotate: Support annotation of files on other revisions.
This is a bug fix, and cleans up one or two other things spotted during the
course of tracking down the main bug here.
Also, the test-suite is updated to reflect this case.
Signed-off-by: Ryan Anderson <ryan@michonline.com>
(cherry picked from 2f7554b4db3ab2c2d3866b160245c91c9236fc9a commit)
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions