diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-02-24 23:33:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-24 23:33:12 -0800 |
| commit | cef19c7af5202c547abe4c8a538ac7b9a4970f0e (patch) | |
| tree | 63cf6a0222f31e41f2ec8f9c7409a5ab2a022690 /git-resolve.sh | |
| parent | diff-patch: Avoid emitting double-slashes in textual patch. (diff) | |
| parent | Don't modify CREDITS-FILE if it hasn't changed. (diff) | |
| download | tgif-cef19c7af5202c547abe4c8a538ac7b9a4970f0e.tar.xz | |
Merge git://repo.or.cz/git-gui into maint
* git://repo.or.cz/git-gui:
Don't modify CREDITS-FILE if it hasn't changed.
Diffstat (limited to 'git-resolve.sh')
0 files changed, 0 insertions, 0 deletions