diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-17 18:34:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-17 18:34:51 -0800 |
| commit | 00bc0ec26296aad8727dcc75f031c7b11e404f20 (patch) | |
| tree | 6fadee301e652caeeb99a9a13e18bcd7f283162d /git-merge-ours.sh | |
| parent | Merge branch 'jc/reflog' (early part) (diff) | |
| parent | git-blame: show lines attributed to boundary commits differently. (diff) | |
| download | tgif-00bc0ec26296aad8727dcc75f031c7b11e404f20.tar.xz | |
Merge branch 'jc/blame-boundary'
* jc/blame-boundary:
git-blame: show lines attributed to boundary commits differently.
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions