diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-05-08 10:42:16 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-05-08 10:42:16 -0400 |
| commit | f0bc498ec17eeb046c3494126e2ff12339abde77 (patch) | |
| tree | 46919c2c1f136744a05a6854c58b337eac6093c1 /contrib/examples/git-resolve.sh | |
| parent | ebcaadabcb90eaf35a3bd69a50cccce4be4dcc2c (diff) | |
| parent | a1a4975824e8f9f88a8c96ae908c488a2c6047c5 (diff) | |
Merge branch 'maint'
* maint:
git-gui: Call changes "Staged" and "Unstaged" in file list titles.
Diffstat (limited to 'contrib/examples/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions