diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-07-02 01:46:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-02 01:46:22 -0700 |
| commit | 1fd81efad0d65afba91f8fb27b40a6345bfb50de (patch) | |
| tree | b061c0e043619ba3469f23b7c73cbbc43cb62dc1 /builtin-merge-file.c | |
| parent | Merge branch 'ns/stash' (diff) | |
| parent | git-svn: allow dcommit to retain local merge information (diff) | |
| download | tgif-1fd81efad0d65afba91f8fb27b40a6345bfb50de.tar.xz | |
Merge branch 'ew/svn'
* ew/svn:
git-svn: allow dcommit to retain local merge information
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions