diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-09 19:19:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-09 19:19:45 -0700 |
| commit | 96779be48a8e5d3a50a07e0fcab942e7066235a9 (patch) | |
| tree | 84cf6f5f84164addc7f511560637d1ee37269121 /git-merge-ours.sh | |
| parent | 9a7a62ff71c436fb5e024ec409ec28fca460a168 (diff) | |
| download | git-96779be48a8e5d3a50a07e0fcab942e7066235a9.tar.gz | |
Fix git-revert
Defaulting to $replay for the sake of fixing cherry-pick was not
done conditionally, which broke git-revert.
Noticed by Luben.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions