diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-01 01:55:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-01 01:55:02 -0700 |
| commit | 9318ec234b75eed6dce10e328c93705fec89b31d (patch) | |
| tree | 19faadfed545cf06078ba1c06c9ad1b4ce2f8e54 /git-merge-ours.sh | |
| parent | Merge branch 'jc/xsha1' into next (diff) | |
| parent | Use RFC2822 dates from "git fmt-patch". (diff) | |
| download | tgif-9318ec234b75eed6dce10e328c93705fec89b31d.tar.xz | |
Merge branch 'jc/fmt-patch' into next
* jc/fmt-patch:
Use RFC2822 dates from "git fmt-patch".
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions