diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-08-05 12:37:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 12:37:24 -0700 |
| commit | f0df1293acdba9513cae17e2c63b4169f1347371 (patch) | |
| tree | e4d9309caa37b13a21ad38147833ed7ee29479bd /git-merge-resolve.sh | |
| parent | gitweb/README: Document $base_url (diff) | |
| parent | Better usage string for reflog. (diff) | |
| download | tgif-f0df1293acdba9513cae17e2c63b4169f1347371.tar.xz | |
Merge branch 'maint-1.6.3' into maint
* maint-1.6.3:
Better usage string for reflog.
hg-to-git: don't import the unused popen2 module
send-email: remove debug trace
config: Keep inner whitespace verbatim
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions