diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-14 00:28:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-14 00:28:52 -0700 |
| commit | 8a642a798f5f3efc25e65a060aab6b53a9fdacdd (patch) | |
| tree | c813c00f97f24b8c9ca28b6af918034dc00302db /Documentation/git-resolve.txt | |
| parent | Merge branch 'js/diffstat' into next (diff) | |
| parent | t5500: test fix (diff) | |
| download | tgif-8a642a798f5f3efc25e65a060aab6b53a9fdacdd.tar.xz | |
Merge branch 'jc/fix5500' into next
* jc/fix5500:
t5500: test fix
Diffstat (limited to 'Documentation/git-resolve.txt')
0 files changed, 0 insertions, 0 deletions