diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-07-09 21:28:27 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-09 21:28:27 -0400 |
| commit | 11a264050f61bb15c413cced058db2ac96fd96f9 (patch) | |
| tree | e8369f6e19c2d4dbbf693525f33c756b4c6664b2 /xdiff/xmerge.c | |
| parent | Revert 88494423 (removal of duplicate parents in the output codepath) (diff) | |
| parent | Clarify documentation of fast-import's D subcommand (diff) | |
| download | tgif-11a264050f61bb15c413cced058db2ac96fd96f9.tar.xz | |
Merge branch 'maint'
* maint:
Clarify documentation of fast-import's D subcommand
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions