diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-21 16:04:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 16:04:37 -0700 |
| commit | 9ee3d3774316f6a60c0618aa7a64fc7a59a8f338 (patch) | |
| tree | 5aa9c4b308d4d084a1d10d718906c86e2b4b711f /t/t6037-merge-ours-theirs.sh | |
| parent | Merge branch 'jc/broken-ref-dwim-fix' (diff) | |
| parent | "rebase -i": support special-purpose editor to edit insn sheet (diff) | |
| download | tgif-9ee3d3774316f6a60c0618aa7a64fc7a59a8f338.tar.xz | |
Merge branch 'po/insn-editor'
* po/insn-editor:
"rebase -i": support special-purpose editor to edit insn sheet
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions