diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-19 23:52:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-19 23:52:30 -0700 |
| commit | f31613d45afa1e5c87c4a9a964ef9b474ef73932 (patch) | |
| tree | 5359448439bd574c0727e7c21b4e238b197645b6 /git-merge-ours.sh | |
| parent | Merge branch 'jc/diff' into next (diff) | |
| parent | git-update-index --unresolve (diff) | |
| download | tgif-f31613d45afa1e5c87c4a9a964ef9b474ef73932.tar.xz | |
Merge branch 'jc/unresolve' into next
* jc/unresolve:
git-update-index --unresolve
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions