[Monotone-commits-diffs] Revision 03b894fa39ec7f1b78a06e9a8e17c6d5953441a3

[monotone]

-----------------------------------------------------------------
Revision: 03b894fa39ec7f1b78a06e9a8e17c6d5953441a3
Ancestor: 7ab23cfe863526079fd6407f129899b1dea8a4e1
Author: address@hidden
Date: 2008-11-11T14:49:17
Branch: net.venge.monotone.resolve_conflicts

Modified files:
        cmd_conflicts.cc
        tests/resolve_conflicts_errors/__driver__.lua

ChangeLog: 

add tests for wrong arg count for conflicts commands.

* cmd_conflicts.cc (set_first_conflict): fix check for arg count.
  (CMD(show_first), CMD(show_remaining)): add check for arg count.

* tests/resolve_conflicts_errors/__driver__.lua: add tests for wrong arg count.

txtCVFItUHzFt.txt
Description: Diff [7ab23cfe863526079fd6407f129899b1dea8a4e1] -> [03b894fa39ec7f1b78a06e9a8e17c6d5953441a3]